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

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

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b9173cfd2..9d2c0e8dd 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -535,9 +535,9 @@ module ApplicationHelper
           if !desc.blank? && alttext.blank?
             alt = " title=\"#{desc}\" alt=\"#{desc}\""
           end
-          "src=\"#{image_url}\"#{alt}"
+          "src=\"#{image_url}\"#{alt}".html_safe
         else
-          m
+          m.html_safe
         end
       end
     end