Use ActionView's safe_join to avoid using raw when joining arrays of text

diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb
index 1fde78790d1a7d86a26c2ae3122a6850bfdec71c..c8433599ff78dbdd8a01bcfb5fa471f2f66146a2 100644 (file)
--- a/app/views/traces/_trace.html.erb
+++ b/app/views/traces/_trace.html.erb
@@ -24,7 +24,7 @@
     <%= t ".by" %> <%= link_to h(trace.user.display_name), user_path(trace.user) %>
     <% if !trace.tags.empty? %>
       <%= t ".in" %>
     <%= t ".by" %> <%= link_to h(trace.user.display_name), user_path(trace.user) %>
     <% if !trace.tags.empty? %>
       <%= t ".in" %>

-      <%= raw(trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ")) %>
+      <%= safe_join(trace.tags.collect { |tag| link_to_tag tag.tag }, ", ") %>

     <% end %>
   </td>
 </tr>
     <% end %>
   </td>
 </tr>

diff --git a/app/views/traces/show.html.erb b/app/views/traces/show.html.erb
index a9978fdc4608ec1df3fb11513c155248d7f63203..07134dbbd4b8599ff4fe874e94900060f4f5f852 100644 (file)
--- a/app/views/traces/show.html.erb
+++ b/app/views/traces/show.html.erb
@@ -40,7 +40,7 @@
     <td><%= t ".tags" %></td>
     <td>
     <% unless @trace.tags.empty? %>
     <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 %>
     <% else %>
       <i><%= t ".none" %></i>
     <% end %>