aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2010-11-08 10:10:30 +1300
committerMichael Koziarski <michael@koziarski.com>2010-11-08 10:10:30 +1300
commit9ecaa803001aa95ff9010c8f5aef71c009577ead (patch)
tree5319e4cef37403c97e3eb35a2361b9d20c12df0e /activesupport
parentf04ec6a227b702342d2fb841f94915499bf6101a (diff)
downloadrails-9ecaa803001aa95ff9010c8f5aef71c009577ead.tar.gz
rails-9ecaa803001aa95ff9010c8f5aef71c009577ead.tar.bz2
rails-9ecaa803001aa95ff9010c8f5aef71c009577ead.zip
Make safe_append= live on AV::OutputBuffer not AS::SafeBuffer
Conflicts: actionpack/lib/action_view/template/handlers/erb.rb
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/string/output_safety.rb1
1 files changed, 0 insertions, 1 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 435317e4b1..37c206ea3c 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -73,7 +73,6 @@ end
module ActiveSupport #:nodoc:
class SafeBuffer < String
alias safe_concat concat
- alias safe_append= concat
def concat(value)
if value.html_safe?