Merge remote-tracking branch 'upstream/pull/2970' into master

[rails.git] / app / views / diary_entries / show.html.erb

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index d8f4cd8f553689941c361ecc3bffc2a44186ce51..4468fc53e6464e879b418d39065dcda1f71f18cd 100644 (file)
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -1,7 +1,7 @@
 <% content_for :heading do %>
   <div id="userinformation">
     <%= user_image @entry.user %>
-    <h2><%= link_to t(".user_title", :user => h(@entry.user.display_name)), :action => :index %></h2>
+    <h2><%= link_to t(".user_title", :user => @entry.user.display_name), :action => :index %></h2>
     <p><%= rss_link_to :action => :rss, :display_name => @entry.user.display_name %></p>
   </div>
 <% end %>
@@ -13,7 +13,7 @@
 <%= render :partial => "diary_comment", :collection => @comments %>
 </div>
 
-<div>
+<div class="standard-form">
   <% if current_user %>
     <h3 id="newcomment"><%= t ".leave_a_comment" %></h3>