diff app/views/repositories/annotate.html.erb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

--- a/app/views/repositories/annotate.html.erb	Fri Feb 24 18:36:29 2012 +0000
+++ b/app/views/repositories/annotate.html.erb	Fri Feb 24 19:09:32 2012 +0000
@@ -14,16 +14,16 @@
 <table class="filecontent annotate syntaxhl">
   <tbody>
     <% line_num = 1 %>
-    <% syntax_highlight(@path, to_utf8(@annotate.content)).each_line do |line| %>
-    <% revision = @annotate.revisions[line_num-1] %>
-    <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
-      <th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th>
-      <td class="revision">
-      <%= (revision.identifier ? link_to_revision(revision, @project) : format_revision(revision)) if revision %></td>
-      <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
-      <td class="line-code"><pre><%= line %></pre></td>
-    </tr>
-    <% line_num += 1 %>
+    <% syntax_highlight(@path, Redmine::CodesetUtil.to_utf8_by_setting(@annotate.content)).each_line do |line| %>
+      <% revision = @annotate.revisions[line_num - 1] %>
+      <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
+        <th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th>
+        <td class="revision">
+        <%= (revision.identifier ? link_to_revision(revision, @project) : format_revision(revision)) if revision %></td>
+        <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
+        <td class="line-code"><pre><%= line %></pre></td>
+      </tr>
+      <% line_num += 1 %>
     <% end %>
   </tbody>
 </table>