Only call html_safe on flash message that responds to it (#2015)

This one line change is already covered by existing feature specs
thoughtbot · Jul 19, 2021 · f8547f4 · f8547f4
1 parent 9d20aad
commit f8547f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/app/views/administrate/application/_flashes.html.erb b/app/views/administrate/application/_flashes.html.erb
@@ -14,6 +14,7 @@ This partial renders flash messages on every page.
 <% if flash.any? %>
   <div class="flashes">
     <% flash.each do |key, value| -%>
+      <% next unless value.respond_to?(:html_safe) %>
       <div class="flash flash-<%= key %>"><%= value.html_safe %></div>
     <% end -%>
   </div>

diff --git a/spec/example_app/app/views/application/_flashes.html.erb b/spec/example_app/app/views/application/_flashes.html.erb
@@ -1,7 +1,7 @@
 <% if flash.any? %>
   <div id="flash">
     <% flash.each do |key, value| -%>
-      <div class="flash-<%= key %>"><%= value %></div>
+      <div class="flash-<%= key %>"><%= value.html_safe %></div>
     <% end -%>
   </div>
 <% end %>