From 1c38ad01792883f8dedbc770554dbf71471889f5 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Sat, 18 Dec 2021 08:56:14 +1100
Subject: [PATCH] Revert removal of "safe" template tag from blog/news
 headlines.

Conservancy use HTML entities in their titles.
---
 www/conservancy/templates/blog/entry_detail.html         | 2 +-
 www/conservancy/templates/blog/entry_partial.html        | 2 +-
 www/conservancy/templates/feeds/blog_title.html          | 2 +-
 www/conservancy/templates/feeds/news_description.html    | 2 +-
 www/conservancy/templates/feeds/news_title.html          | 2 +-
 www/conservancy/templates/news/pressrelease_detail.html  | 2 +-
 www/conservancy/templates/news/pressrelease_partial.html | 4 ++--
 www/conservancy/templates/opengraph_partial.html         | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/www/conservancy/templates/blog/entry_detail.html b/www/conservancy/templates/blog/entry_detail.html
index 70bd722b..87488a68 100644
--- a/www/conservancy/templates/blog/entry_detail.html
+++ b/www/conservancy/templates/blog/entry_detail.html
@@ -6,7 +6,7 @@
 {% include "opengraph_urllist_partial.html" with property='video' urls=object.get_one_video_url %}
 {% endblock %}
 
-{% block subtitle %}{{ object.headline|striptags }} - Conservancy Blog - {% endblock %}
+{% block subtitle %}{{ object.headline|striptags|safe }} - Conservancy Blog - {% endblock %}
 
 {% block content %}
 <div class="breadcrumbs">
diff --git a/www/conservancy/templates/blog/entry_partial.html b/www/conservancy/templates/blog/entry_partial.html
index 9ec8266f..571d69f2 100644
--- a/www/conservancy/templates/blog/entry_partial.html
+++ b/www/conservancy/templates/blog/entry_partial.html
@@ -18,7 +18,7 @@ This partial accepts these optional parameters:
 
 <{{ htag|default:"h3" }} class="clear"
   >{% if show|default:"body" != "body" %}<a href="{{ entry.get_absolute_url }}"
-  >{% endif %}{{ entry.headline }}{% if show|default:"body" != "body" %}</a>{% endif %}</{{ htag|default:"h3" }}>
+  >{% endif %}{{ entry.headline|safe }}{% if show|default:"body" != "body" %}</a>{% endif %}</{{ htag|default:"h3" }}>
 
 {% if show != "headline" %}
 <p class="date">by <span class="author">{{ entry.author.formal_name }}</span>
diff --git a/www/conservancy/templates/feeds/blog_title.html b/www/conservancy/templates/feeds/blog_title.html
index d05ff107..41fedac7 100644
--- a/www/conservancy/templates/feeds/blog_title.html
+++ b/www/conservancy/templates/feeds/blog_title.html
@@ -1 +1 @@
-{{ obj.headline|striptags }}
+{{ obj.headline|striptags|safe }}
diff --git a/www/conservancy/templates/feeds/news_description.html b/www/conservancy/templates/feeds/news_description.html
index 69751ba9..34c9a619 100644
--- a/www/conservancy/templates/feeds/news_description.html
+++ b/www/conservancy/templates/feeds/news_description.html
@@ -1,3 +1,3 @@
-{% if obj.subhead %}<p><strong>{{ obj.subhead }}</strong></p>{% endif %}
+{% if obj.subhead %}<p><strong>{{ obj.subhead|safe }}</strong></p>{% endif %}
 {{ obj.summary|safe }}
 {{ obj.body|safe }}
diff --git a/www/conservancy/templates/feeds/news_title.html b/www/conservancy/templates/feeds/news_title.html
index d05ff107..41fedac7 100644
--- a/www/conservancy/templates/feeds/news_title.html
+++ b/www/conservancy/templates/feeds/news_title.html
@@ -1 +1 @@
-{{ obj.headline|striptags }}
+{{ obj.headline|striptags|safe }}
diff --git a/www/conservancy/templates/news/pressrelease_detail.html b/www/conservancy/templates/news/pressrelease_detail.html
index 8cabc8ad..90ac7fcf 100644
--- a/www/conservancy/templates/news/pressrelease_detail.html
+++ b/www/conservancy/templates/news/pressrelease_detail.html
@@ -6,7 +6,7 @@
 {% include "opengraph_urllist_partial.html" with property='video' urls=object.get_one_video_url %}
 {% endblock %}
 
-{% block subtitle %}{{ object.headline|striptags }} - {% endblock %}
+{% block subtitle %}{{ object.headline|striptags|safe }} - {% endblock %}
 
 {% block content %}
 
diff --git a/www/conservancy/templates/news/pressrelease_partial.html b/www/conservancy/templates/news/pressrelease_partial.html
index 2751cb4f..dc0fb687 100644
--- a/www/conservancy/templates/news/pressrelease_partial.html
+++ b/www/conservancy/templates/news/pressrelease_partial.html
@@ -19,13 +19,13 @@ This partial accepts these optional parameters:
 
 <{{ htag|default:"h3" }} class="clear"
   >{% if show|default:"body" != "body" %}<a href="{{ pressr.get_absolute_url }}"
-  >{% endif %}{{ pressr.headline }}{% if show|default:"body" != "body" %}</a>{% endif %}</{{ htag|default:"h3" }}>
+  >{% endif %}{{ pressr.headline|safe }}{% if show|default:"body" != "body" %}</a>{% endif %}</{{ htag|default:"h3" }}>
 
 {% if show != "headline" %}
 {% if show != "dateline" and pressr.subhead %}
   {# This filter sequence generates the "next" hN tag from htag #}
   <h{{ htag|default:"3"|last|get_digit:1|add:1 }}
-     >{{ pressr.subhead }}</h{{ htag|default:"3"|last|get_digit:1|add:1 }}>
+     >{{ pressr.subhead|safe }}</h{{ htag|default:"3"|last|get_digit:1|add:1 }}>
 {% endif %}
 
 <p class="date">{{ pressr.pub_date|date:"F j, Y" }}</p>
diff --git a/www/conservancy/templates/opengraph_partial.html b/www/conservancy/templates/opengraph_partial.html
index 3143ca71..631529df 100644
--- a/www/conservancy/templates/opengraph_partial.html
+++ b/www/conservancy/templates/opengraph_partial.html
@@ -36,9 +36,9 @@ normally shouldn't need to:
 {% endif %}
 
 {% if title %}
-<meta property="og:title" content="{{ title|striptags }}">
+<meta property="og:title" content="{{ title|striptags|safe }}">
 {% endif %}
 
 {% if description %}
-<meta property="og:description" content="{{ description|striptags }}">
+<meta property="og:description" content="{{ description|striptags|safe }}">
 {% endif %}