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

[rails.git] / app / views / browse / _containing_relation.html.erb

diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb
index 1dca0c26ee3de7ef23efff21238339a60da90a2e..06220a97ddb9267b471e2aaea31a86273b0a5463 100644 (file)
--- a/app/views/browse/_containing_relation.html.erb
+++ b/app/views/browse/_containing_relation.html.erb
@@ -1,9 +1,7 @@
-<li><%=
-  linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s
-  if containing_relation.member_role.blank?
-    raw t ".entry", :relation_name => linked_name
-  else
-    raw t ".entry_role", :relation_name => linked_name, :relation_role => h(containing_relation.member_role)
-  end
-    %>
+<li><%= linked_name = link_to printable_name(containing_relation.relation), :action => "relation", :id => containing_relation.relation.id.to_s
+        if containing_relation.member_role.blank?
+          t ".entry_html", :relation_name => linked_name
+        else
+          t ".entry_role_html", :relation_name => linked_name, :relation_role => containing_relation.member_role
+        end %>
 </li>