to_str works here

rails · Mar 15, 2010 · c937da9 · c937da9
1 parent ed19955
commit c937da9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
@@ -54,7 +54,7 @@ def write_fragment(key, content, options = nil)
 
         key = fragment_cache_key(key)
         instrument_fragment_cache :write_fragment, key do
-          content = content.html_safe.as_str if content.respond_to?(:html_safe)
+          content = content.html_safe.to_str if content.respond_to?(:html_safe)
           cache_store.write(key, content, options)
         end
         content

diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -89,12 +89,8 @@ def to_s
       self
     end
 
-    def as_str
-      ''.replace(self)
-    end
-
     def to_yaml(*args)
-      as_str.to_yaml(*args)
+      to_str.to_yaml(*args)
     end
   end
 end