Merge remote-tracking branch 'upstream/pull/2683'

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

diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 8ad5af9ddac518207104718425245d4c622d00d0..7cf674fefd678b4ed21792b0e1e9f2ac8f479ff1 100644 (file)
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -1,11 +1,11 @@
 <% if current_user == @message.recipient %>
   <% content_for :heading do %>
 <% if current_user == @message.recipient %>
   <% content_for :heading do %>

-    <h2><%= h(@message.title) %></h2>
+    <h2><%= @message.title %></h2>

   <% end %>
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.sender %>
   <% end %>
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.sender %>

-    <%= link_to h(@message.sender.display_name), user_path(@message.sender) %></td>
+    <%= link_to @message.sender.display_name, user_path(@message.sender) %></td>

     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>
     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>


@@ -17,14 +17,16 @@
     <%= button_to t(".reply_button"), message_reply_path(@message), :class => "reply-button" %>
     <%= button_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :class => "mark-unread-button" %>
     <%= button_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "destroy-button" %>
     <%= button_to t(".reply_button"), message_reply_path(@message), :class => "reply-button" %>
     <%= button_to t(".unread_button"), message_mark_path(@message, :mark => "unread"), :class => "mark-unread-button" %>
     <%= button_to t(".destroy_button"), message_path(@message), :method => "delete", :class => "destroy-button" %>

+    <%= link_to t(".back"), inbox_messages_path, :class => "button deemphasize" %>
+  </div>

 
 <% else %>
 
 
 <% else %>
 

-  <h2><%= h(@message.title) %></h2>
+  <h2><%= @message.title %></h2>

 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.recipient %>
 
   <div class='info-line clearfix'>
     <%= user_thumbnail_tiny @message.recipient %>

-    <%= link_to h(@message.recipient.display_name), user_path(@message.recipient) %></td>
+    <%= link_to @message.recipient.display_name, user_path(@message.recipient) %></td>

     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>
     <div class='right'>
       <%= l @message.sent_on, :format => :friendly %>
     </div>


@@ -33,8 +35,7 @@
   <div class="richtext"><%= @message.body.to_html %></div>
 
   <div class='message-buttons buttons'>
   <div class="richtext"><%= @message.body.to_html %></div>
 
   <div class='message-buttons buttons'>

+    <%= link_to t(".back"), outbox_messages_path, :class => "button deemphasize" %>
+  </div>

 
 <% end %>
 
 <% end %>

-
-  <%= link_to t(".back"), outbox_messages_path, :class => "button deemphasize" %>
-  </div>