diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-03-15 19:46:03 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-03-15 19:46:03 +0000 |
| commit | 03a62f4afedbef8bda72c8fdf9a0092273c0f2b0 (patch) | |
| tree | 2155b65750757d26e3c8c8e0655ad32cc89d6c2e /activesupport/lib | |
| parent | f53fddf3665e6582768f4ab0c82b286b39e7fb19 (diff) | |
| parent | a594a22267bfd3346e00923742c4aa7edad0cef7 (diff) | |
| download | rails-03a62f4afedbef8bda72c8fdf9a0092273c0f2b0.tar.gz rails-03a62f4afedbef8bda72c8fdf9a0092273c0f2b0.tar.bz2 rails-03a62f4afedbef8bda72c8fdf9a0092273c0f2b0.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/output_safety.rb | 6 |
1 files changed, 1 insertions, 5 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 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 |