From 8f8d8eb1465069e2ed9b6f2404aa9d02e785f534 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Fri, 3 Aug 2012 02:14:29 -0300
Subject: Use content_tag here instead of manually building HTML

---
 actionpack/lib/action_view/helpers/debug_helper.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view/helpers')

diff --git a/actionpack/lib/action_view/helpers/debug_helper.rb b/actionpack/lib/action_view/helpers/debug_helper.rb
index 878a8734a4..d8b92c5cab 100644
--- a/actionpack/lib/action_view/helpers/debug_helper.rb
+++ b/actionpack/lib/action_view/helpers/debug_helper.rb
@@ -4,6 +4,9 @@ module ActionView
   # Provides a set of methods for making it easier to debug Rails objects.
   module Helpers
     module DebugHelper
+
+      include TagHelper
+
       # Returns a YAML representation of +object+ wrapped with <pre> and </pre>.
       # If the object cannot be converted to YAML using +to_yaml+, +inspect+ will be called instead.
       # Useful for inspecting an object at the time of rendering.
@@ -26,10 +29,11 @@ module ActionView
       def debug(object)
         begin
           Marshal::dump(object)
-          "<pre class='debug_dump'>#{h(object.to_yaml).gsub("  ", "&nbsp; ")}</pre>".html_safe
+          object = ERB::Util.html_escape(object.to_yaml).gsub("  ", "&nbsp; ").html_safe
+          content_tag(:pre, object, :class => "debug_dump")
         rescue Exception  # errors from Marshal or YAML
           # Object couldn't be dumped, perhaps because of singleton methods -- this is the fallback
-          "<code class='debug_dump'>#{h(object.inspect)}</code>".html_safe
+          content_tag(:code, object.to_yaml, :class => "debug_dump")
         end
       end
     end
-- 
cgit v1.2.3