aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-03-15 11:17:18 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-03-15 11:18:45 -0700
commitc937da9e2fc14f74fb11d1ce605479c033ca29ee (patch)
treef9e65680b6553bb054f00dff498ed62e5f14823b
parented199554f10d208f74d7f052b86c4038a8c8c772 (diff)
downloadrails-c937da9e2fc14f74fb11d1ce605479c033ca29ee.tar.gz
rails-c937da9e2fc14f74fb11d1ce605479c033ca29ee.tar.bz2
rails-c937da9e2fc14f74fb11d1ce605479c033ca29ee.zip
to_str works here
-rw-r--r--actionpack/lib/action_controller/caching/fragments.rb2
-rw-r--r--activesupport/lib/active_support/core_ext/string/output_safety.rb6
2 files changed, 2 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb
index 841e64ecaf..89787727bd 100644
--- a/actionpack/lib/action_controller/caching/fragments.rb
+++ b/actionpack/lib/action_controller/caching/fragments.rb
@@ -54,7 +54,7 @@ module ActionController #:nodoc:
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
index af46ae10d6..9a7c520e75 100644
--- 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 @@ module ActiveSupport #:nodoc:
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