diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-02-22 03:38:08 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2012-02-22 03:38:08 +0000 |
| commit | 652871d4c3e459b428637aa5b340dbd368e83618 (patch) | |
| tree | 0719654723b3f1663495363ce337e9b3356ecacd | |
| parent | f5c4607769b26f25c5113db28ea7d710ad5f2387 (diff) | |
| download | redmine-652871d4c3e459b428637aa5b340dbd368e83618.tar.gz redmine-652871d4c3e459b428637aa5b340dbd368e83618.zip | |
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
| -rw-r--r-- | app/views/common/_diff.html.erb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/common/_diff.html.erb b/app/views/common/_diff.html.erb index 3e03720f8..cf99967f7 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 -%> |