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 f853916af9955aa0b833a245269ce87684c93f63..7afaffc2e682ccdb100a11cd33f0c585e7fb155e 100644 (file)
--- 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">
 
        {% 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 %}
 
   </div>
   {% endif %}
 

diff --git a/forum/skins/default/templates/sidebar/user_blocks.html b/forum/skins/default/templates/sidebar/user_blocks.html
index d3d98cc27ac925ea2e1fccde5dbbf0bb721dc598..9bf843cb01ebf1970e14a4b7d267f8ff3a6e2d87 100644 (file)
--- 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 %}
 {% if show %}
 {% if wrap %}<div id="{{ blockid }}" class="boxC">
     <div class="body">{% endif %}

-        {{ content }}
+        {{ content|markdown }}

      {% if wrap %}</div>
 </div>{% endif %}
 {% endif %}
      {% if wrap %}</div>
 </div>{% endif %}
 {% endif %}