Rails3: prevent double rendering file view and annotate on Rails 3.0.11 and Rails 3.1.3

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

app/views/common/_file.html.erb

@@ -2,13 +2,13 @@
 <table class="filecontent syntaxhl">
 <tbody>
 <% line_num = 1 %>
-<% syntax_highlight(filename, Redmine::CodesetUtil.to_utf8_by_setting(content)).each_line do |line| %>
+<% syntax_highlight_lines(filename, Redmine::CodesetUtil.to_utf8_by_setting(content)).each do |line| %>
   <tr>
     <th class="line-num" id="L<%= line_num %>">
       <a href="#L<%= line_num %>"><%= line_num %></a>
     </th>
     <td class="line-code">
-      <pre><%= line %></pre>
+      <pre><%= line.html_safe %></pre>
     </td>
   </tr>
   <% line_num += 1 %>