From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Wed, 10 Nov 2010 12:09:18 +0000 (+0000)
Subject: Some missing changes from the last commit.
X-Git-Tag: live~518
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/fae1cd4f93e2c24870ff2df5dac06d3c7feb37b2

Some missing changes from the last commit.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@616 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/skins/default/templates/header.html b/forum/skins/default/templates/header.html
index f853916..7afaffc 100644
--- a/forum/skins/default/templates/header.html
+++ b/forum/skins/default/templates/header.html
@@ -40,7 +40,7 @@
 
 	{% if settings.USE_ANNOUNCEMENT_BAR|or_preview:request %}
   <div id="announcement">
-      {{ settings.ANNOUNCEMENT_BAR|or_preview:request|safe }}
+      {{ settings.ANNOUNCEMENT_BAR|or_preview:request|markdown:"settingsparser" }}
   </div>
   {% endif %}
 
diff --git a/forum/skins/default/templates/sidebar/user_blocks.html b/forum/skins/default/templates/sidebar/user_blocks.html
index d3d98cc..9bf843c 100644
--- a/forum/skins/default/templates/sidebar/user_blocks.html
+++ b/forum/skins/default/templates/sidebar/user_blocks.html
@@ -3,7 +3,7 @@
 {% if show %}
 {% if wrap %}<div id="{{ blockid }}" class="boxC">
     <div class="body">{% endif %}
-        {{ content }}
+        {{ content|markdown }}
      {% if wrap %}</div>
 </div>{% endif %}
 {% endif %}