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

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

diff --git a/app/views/traces/show.html.erb b/app/views/traces/show.html.erb
index 728b29c45fee0868af0ba14a891be4d5b3904a1c..e652453695b30a8942b5df14fd3420b110db9260 100644 (file)
--- a/app/views/traces/show.html.erb
+++ b/app/views/traces/show.html.erb
@@ -1,5 +1,5 @@
 <% content_for :heading do %>
-  <h2><%= t ".heading", :name => h(@trace.name) %></h2>
+  <h2><%= t ".heading", :name => @trace.name %></h2>
 <% end %>
 
 <% if Settings.status != "gpx_offline" %>
@@ -30,17 +30,17 @@
   <% end %>
   <tr>
     <td><%= t ".owner" %></td>
-    <td><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></td>
+    <td><%= link_to @trace.user.display_name, user_path(@trace.user) %></td>
   </tr>
   <tr>
     <td><%= t ".description" %></td>
-    <td><%= h(@trace.description) %></td>
+    <td><%= @trace.description %></td>
   </tr>
   <tr>
     <td><%= t ".tags" %></td>
     <td>
     <% unless @trace.tags.empty? %>
-      <%= raw(@trace.tags.collect { |tag| link_to tag.tag, :controller => "traces", :action => "index", :tag => tag.tag, :id => nil }.join(", ")) %>
+      <%= safe_join(@trace.tags.collect { |tag| link_to tag.tag, :controller => "traces", :action => "index", :tag => tag.tag, :id => nil }, ", ") %>
     <% else %>
       <i><%= t ".none" %></i>
     <% end %>