Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

2014-08-29 15:07:34 +08:00 · 2014-08-29 15:07:34 +08:00 · 24a0f3e774
parent c743f58104 8fc9e65e66
commit 24a0f3e774
1 changed files with 1 additions and 1 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -737,7 +737,7 @@ module ApplicationHelper

    text = text.dup
    macros = catch_macros(text)
-    text = Redmine::WikiFormatting.to_html("CKEditor", text, :object => obj, :attribute => attr)
+    #text = Redmine::WikiFormatting.to_html("CKEditor", text, :object => obj, :attribute => attr)

    @parsed_headings = []
    @heading_anchors = {}