Merge pull request #1750 from dmathieu/non_string_methods

Calling unsafe methods which don't return a string shouldn't fail

2 files changed, 6 insertions, 2 deletions

diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
index 71f3879e49..a19b5c95c7 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -137,8 +137,8 @@ module ActiveSupport #:nodoc:
 
     UNSAFE_STRING_METHODS.each do |unsafe_method|
       class_eval <<-EOT, __FILE__, __LINE__
-        def #{unsafe_method}(*args)
-          super.to_str
+        def #{unsafe_method}(*args, &block)
+          to_str.#{unsafe_method}(*args, &block)
         end
 
         def #{unsafe_method}!(*args)
diff --git a/activesupport/test/safe_buffer_test.rb b/activesupport/test/safe_buffer_test.rb
index a8b39d2c38..08cc00ac51 100644
--- a/activesupport/test/safe_buffer_test.rb
+++ b/activesupport/test/safe_buffer_test.rb
@@ -104,4 +104,8 @@ class SafeBufferTest < ActiveSupport::TestCase
       @buffer.safe_concat "BUSTED"
     end
   end
+  
+  test "should not fail if the returned object is not a string" do
+    assert_kind_of Enumerator, @buffer.gsub(/.*/)
+  end
 end