Don't escape HTML in the "user suspended" message

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

diff --git a/app/views/diary_entry/_diary_entry.html.erb b/app/views/diary_entry/_diary_entry.html.erb
index 02100c74dbf8d4c596709c68c7fba0a30ec5bd7a..dc09ed957957ac0e5606d4b205ffb9314a28a709 100644 (file)
--- a/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@ -1,7 +1,7 @@
 <b><%= link_to h(diary_entry.title), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id %></b><br />
 
 <div xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
-  <%= raw(htmlize(diary_entry.body)) %>
+  <%= htmlize(diary_entry.body) %>
 </div>
 
 <% if diary_entry.latitude and diary_entry.longitude %>
@@ -19,10 +19,10 @@
   |
   <%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %>
 <% end %>
-<% if_user(diary_entry.user, :span) do %>
+<%= if_user(diary_entry.user, :span) do %>
   | <%= link_to t('diary_entry.diary_entry.edit_link'), :action => 'edit', :display_name => diary_entry.user.display_name, :id => diary_entry.id %>
 <% end %>
-<% if_administrator(:span) do %>
+<%= if_administrator(:span) do %>
   | <%= link_to t('diary_entry.diary_entry.hide_link'), {:action => 'hide', :display_name => diary_entry.user.display_name, :id => diary_entry.id}, {:confirm => t('diary_entry.diary_entry.confirm')} %>
 <% end %>