From 652871d4c3e459b428637aa5b340dbd368e83618 2012-02-22 03:38:08
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: 2012-02-22 03:38:08
Subject: [PATCH] Rails3: view: html_safe for common/_diff.html.erb

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

---

diff --git a/app/views/common/_diff.html.erb b/app/views/common/_diff.html.erb
index 3e03720..cf99967 100644
--- a/app/views/common/_diff.html.erb
+++ b/app/views/common/_diff.html.erb
@@ -23,11 +23,11 @@
 <tr>
   <th class="line-num"><%= line.nb_line_left %></th>
   <td class="line-code <%= line.type_diff_left %>">
-    <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_left) %></pre>
+    <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_left).html_safe %></pre>
   </td>
   <th class="line-num"><%= line.nb_line_right %></th>
   <td class="line-code <%= line.type_diff_right %>">
-    <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_right) %></pre>
+    <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line_right).html_safe %></pre>
   </td>
 </tr>
 <% end -%>
@@ -54,7 +54,7 @@
   <th class="line-num"><%= line.nb_line_left %></th>
   <th class="line-num"><%= line.nb_line_right %></th>
   <td class="line-code <%= line.type_diff %>">
-    <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line) %></pre>
+    <pre><%= Redmine::CodesetUtil.to_utf8_by_setting(line.html_line).html_safe %></pre>
   </td>
 </tr>
 <% end -%>