Merge branch 'master' into openstreetbugs

[rails.git] / app / views / diary_entry / comments.html.erb

diff --git a/app/views/diary_entry/comments.html.erb b/app/views/diary_entry/comments.html.erb
index 1404847b37ece29f2b1dc3e8198f1ccd2cb9f659..f477ab8b63e97016cb9aca9b3de082b3493a82f2 100644 (file)
--- a/app/views/diary_entry/comments.html.erb
+++ b/app/views/diary_entry/comments.html.erb
@@ -9,9 +9,9 @@
   <% @comments.each do |comment| -%>
   <% cl = cycle('table0', 'table1') %>
   <tr class="<%= cl %>">
-    <td><%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user, :id => comment.diary_entry.id %></td>
+    <td><%= link_to comment.diary_entry.title, :action => :view, :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id %></td>
     <td><span title="<%= l comment.created_at, :format => :friendly %>"><%= t 'diary_entry.comments.ago', :ago => time_ago_in_words(comment.created_at) %></span></td>
-    <td><%= htmlize(comment.body) %></td>
+    <td><%= comment.body.to_html %></td>
   </tr>
   <% end -%>
 </table>