Reverts some changes in a previous commit.

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

diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html
index b0ee37dc68f44db0ab820e51c25af1995c6ddb41..76eec6e2923469d760ee99fe02cb9b76812cdb45 100644 (file)
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -56,7 +56,7 @@
         </script>
         {% endif %}
         {% if settings.USE_CUSTOM_HEAD|or_preview:request %}
         </script>
         {% endif %}
         {% if settings.USE_CUSTOM_HEAD|or_preview:request %}

-            {{ settings.CUSTOM_HEAD|or_preview:request|safe }}
+            {{ settings.CUSTOM_HEAD|or_preview:request|markdown:"settingsparser" }}

         {% endif %}
         {% block forejs %}{% endblock %}
         <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch %}" title="{{ settings.APP_SHORT_NAME }} Search" />
         {% endif %}
         {% block forejs %}{% endblock %}
         <link rel="search" type="application/opensearchdescription+xml" href="{% url opensearch %}" title="{{ settings.APP_SHORT_NAME }} Search" />


@@ -98,19 +98,19 @@
         {% if settings.USE_CUSTOM_FOOTER|or_preview:request %}
             {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "above" %}
                 <div id="custom_footer">
         {% if settings.USE_CUSTOM_FOOTER|or_preview:request %}
             {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "above" %}
                 <div id="custom_footer">

-                    {{ settings.CUSTOM_FOOTER|or_preview:request|safe }}
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|markdown:"settingsparser" }}

                 </div>
             {% endifequal %}
             <div id="ground">
                 {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "replace" %}
                 </div>
             {% endifequal %}
             <div id="ground">
                 {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "replace" %}

-                    {{ settings.CUSTOM_FOOTER|or_preview:request|safe }}
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|markdown:"settingsparser" }}

                 {% else %}
                     {% include "footer.html" %}
                 {% endifequal %}
             </div>
             {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "below" %}
                 <div id="custom_footer">
                 {% else %}
                     {% include "footer.html" %}
                 {% endifequal %}
             </div>
             {% ifequal settings.CUSTOM_FOOTER_MODE|or_preview:request "below" %}
                 <div id="custom_footer">

-                    {{ settings.CUSTOM_FOOTER|or_preview:request|safe }}
+                    {{ settings.CUSTOM_FOOTER|or_preview:request|markdown:"settingsparser" }}

                 </div>
             {% endifequal %}
         {% else %}
                 </div>
             {% endifequal %}
         {% else %}