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

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

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9d2c0e8dd..cf94f8a66 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -582,10 +582,10 @@ module ApplicationHelper
           link_to(h(title || page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new')))
         else
           # project or wiki doesn't exist
-          all
+          all.html_safe
         end
       else
-        all
+        all.html_safe
       end
     end
   end