Skip to content
Browse files

Make safe_append= live on AV::OutputBuffer not AS::SafeBuffer

Conflicts:

	actionpack/lib/action_view/template/handlers/erb.rb
  • Loading branch information...
1 parent f04ec6a commit 9ecaa803001aa95ff9010c8f5aef71c009577ead @NZKoz NZKoz committed Nov 8, 2010
View
1 actionpack/lib/action_view/template/handlers/erb.rb
@@ -15,6 +15,7 @@ def <<(value)
super(value.to_s)
end
alias :append= :<<
+ alias :safe_append= :safe_concat
end
class Template
View
1 activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -73,7 +73,6 @@ def html_safe?
module ActiveSupport #:nodoc:
class SafeBuffer < String
alias safe_concat concat
- alias safe_append= concat
def concat(value)
if value.html_safe?

0 comments on commit 9ecaa80

Please sign in to comment.
Something went wrong with that request. Please try again.