]> source.dussan.org Git - redmine.git/commitdiff
Rails3: view: html_safe for common/_diff.html.erb
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 22 Feb 2012 03:38:08 +0000 (03:38 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Wed, 22 Feb 2012 03:38:08 +0000 (03:38 +0000)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8919 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/views/common/_diff.html.erb

index 3e03720f82059adf58361802bcb39fac8c0cf0cc..cf99967f759c2ad4dee20185d9ca6dc4b1ff8c75 100644 (file)
 <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 -%>