From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 20 Aug 2011 11:14:29 +0000 (+0000)
Subject: Rails3: use String#html_safe for parse_non_pre_blocks() at ApplicationHelper.
X-Git-Tag: 1.3.0~1477
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5031bab474bcab739303306d8fbfef70117304bb;p=redmine.git

Rails3: use String#html_safe for parse_non_pre_blocks() at ApplicationHelper.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6484 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1d4a36f12..b9173cfd2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -518,7 +518,7 @@ module ApplicationHelper
     while tag = tags.pop
       parsed << "</#{tag}>"
     end
-    parsed
+    parsed.html_safe
   end
 
   def parse_inline_attachments(text, project, obj, attr, only_path, options)