Remove safe tag for markdown

Broken in newer versions of django, and since all our content is moderated anyway,
it isn't strictly necessariy for us anyway.

diff --git a/templates/downloads/productlist.html b/templates/downloads/productlist.html
index 8cf95d565b400b08727a21573dd4b97ca07d3a49..31227a82866efbd4ace73e7e94cfea811619d935 100644 (file)
--- a/templates/downloads/productlist.html
+++ b/templates/downloads/productlist.html
@@ -17,7 +17,7 @@
 </tr>
 <tr>
   <th class="colFirst" style="vertical-align: top;">Description</th>
-  <td class="colLast">{{product.description|markdown:"safe"}}</td>
+  <td class="colLast">{{product.description|markdown}}</td>
 </tr>
 <tr>
   <th class="colFirst">Licence</th>

diff --git a/templates/events/archive.html b/templates/events/archive.html
index f57e9395c042f04270eabf41a1107629fc3edf43..27b4a9915a3690d6675448b098c1cbc1ae5850f3 100644 (file)
--- a/templates/events/archive.html
+++ b/templates/events/archive.html
@@ -17,7 +17,7 @@ whatsoever.</i>
 <div>Location: <b>{{event.locationstring}}</b></div>
 {%if event.language%}<div>Language: <b>{{event.language}}</b></div>{%endif%}
 <p>
-{{event.summary|markdown:"safe"}}
+{{event.summary|markdown}}
 </p>
 {%endfor%}
 {%if not archive%}

diff --git a/templates/events/item.html b/templates/events/item.html
index db7257276b5424db91d3730e0c6eeb2fa0524517..507daa63c06045437586d09533fc1a2b05149083 100644 (file)
--- a/templates/events/item.html
+++ b/templates/events/item.html
@@ -6,7 +6,7 @@
 <div class="eventdate">Date: <b>{{obj.displaydate|safe}}</b></div>
 <div>Location: {{obj.locationstring}}</div>
 {%if obj.language%}<div>Language: {{obj.language}}</div>{%endif%}
-{{obj.details|markdown:"safe"}}
+{{obj.details|markdown}}
 {%if obj.has_organisation%}
 <p>Posted by {{obj.org}}{%if obj.org.email%} ({{obj.org.email}}){%endif%}.</p>
 {%else%}

diff --git a/templates/events/rss_description.html b/templates/events/rss_description.html
index 9d79bd83513739ffc14bc1f13c322a17d860210e..e358b822cf78a649ec2c5a5c050185381d056111 100644 (file)
--- a/templates/events/rss_description.html
+++ b/templates/events/rss_description.html
@@ -1,3 +1,3 @@
 {%load markup%}
-{{obj.summary|markdown:"safe"}}
+{{obj.summary|markdown}}
 

diff --git a/templates/news/item.html b/templates/news/item.html
index 3393af6ff7c5fb86f416117c93c30a17bb928b01..1399fb22294de98eda058ec25b95517286e2e3b7 100644 (file)
--- a/templates/news/item.html
+++ b/templates/news/item.html
@@ -4,7 +4,7 @@
 {%block contents%}
 <h1>{{obj.title}}</h1>
 <div class="newsdate">Posted on <b>{{obj.date}}</b></div>
-{{obj.content|markdown:"safe"}}
+{{obj.content|markdown}}
 {%if obj.is_migrated%}
 <p><i>This post has been migrated from a previous version of the PostgreSQL
 website. We apologise for any formatting issues caused by the migration.</i></p>

diff --git a/templates/news/newsarchive.html b/templates/news/newsarchive.html
index 491435f49789f5b35eb8f8ca9d9a65ac346430a8..4c552605c54df838c4ddaa926edc5aee9c3b5840 100644 (file)
--- a/templates/news/newsarchive.html
+++ b/templates/news/newsarchive.html
@@ -6,7 +6,7 @@
 {%for obj in news %}
 <h2><a href="/about/news/{{obj.id}}/">{{obj.title}}</a></h2>
 <div class="newsdate">Posted on <b>{{obj.date}}</b></div>
-{{obj.content|markdown:"safe"|striptags|truncatewords:20}}
+{{obj.content|markdown|striptags|truncatewords:20}}
 {%endfor%}
 <p><a href="/account/news/new/">Submit news</a></p>
 {%endblock%}

diff --git a/templates/news/rss_description.html b/templates/news/rss_description.html
index d2662c17d932351e2c701a734d75173325eeba99..c7e60bc785b9ced82eaeffd6a8742835bdab5469 100644 (file)
--- a/templates/news/rss_description.html
+++ b/templates/news/rss_description.html
@@ -1,3 +1,3 @@
 {%load markup%}
-{{obj.content|markdown:"safe"}}
+{{obj.content|markdown}}