kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rails3: view: html_safe for common/_diff.html.erb

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8919 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2012-02-22 03:38:08 +00:00
parent f5c4607769
commit 652871d4c3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/common/_diff.html.erb
View File

@ -23,11 +23,11 @@
<tr> <tr>
<th class="line-num"><%= line.nb_line_left %></th> <th class="line-num"><%= line.nb_line_left %></th>
<td class="line-code <%= line.type_diff_left %>"> <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> </td>
<th class="line-num"><%= line.nb_line_right %></th> <th class="line-num"><%= line.nb_line_right %></th>
<td class="line-code <%= line.type_diff_right %>"> <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> </td>
</tr> </tr>
<% end -%> <% end -%>
@ -54,7 +54,7 @@
<th class="line-num"><%= line.nb_line_left %></th> <th class="line-num"><%= line.nb_line_left %></th>
<th class="line-num"><%= line.nb_line_right %></th> <th class="line-num"><%= line.nb_line_right %></th>
<td class="line-code <%= line.type_diff %>"> <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> </td>
</tr> </tr>
<% end -%> <% end -%>