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

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 = {}