Merge pull request rails#3123 from avakhov/patch-5-remove-superfluous…

…-to-s remove superfluous to_s in ERB::Util.html_escape
JEG2 · Sep 24, 2011 · 42c2b24 · 42c2b24
1 parent 6cb0d35
commit 42c2b24
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -20,7 +20,7 @@ def html_escape(s)
       if s.html_safe?
         s
       else
-        s.to_s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;").html_safe
+        s.gsub(/&/, "&amp;").gsub(/\"/, "&quot;").gsub(/>/, "&gt;").gsub(/</, "&lt;").html_safe
       end
     end