Merge branch 'dev' into new-arch

* dev: 修复页脚备案信息显示错误的问题，被django自动转义了，本来想用|safe呢结果好像不好使，最后用autoescape off标签了
2015-12-10 10:12:13 +08:00
parent d66cb1f3e0 446fe0e545
commit 0c7a2bd504
1 changed files with 1 additions and 1 deletions
--- a/template/src/oj_base.html
+++ b/template/src/oj_base.html
@@ -97,7 +97,7 @@
 {% block js_block %}{% endblock %}
 <!-- footer begin -->
 <div class="footer">
-    <p class="text-muted text-center">Copyright © 2015 {% show_website_info "website_footer" %}</p>
+    <p class="text-muted text-center">Copyright © 2015 {% autoescape off %}{% show_website_info "website_footer" %}{% endautoescape %}</p>
 </div>
 <!-- footer end -->
 </body>