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

Conflicts: actionpack/lib/action_view/template/handlers/erb.rb
rails · Nov 7, 2010 · 9ecaa80 · 9ecaa80
1 parent f04ec6a
commit 9ecaa80
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/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

diff --git 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 @@ def html_safe?
 module ActiveSupport #:nodoc:
   class SafeBuffer < String
     alias safe_concat concat
-    alias safe_append= concat
 
     def concat(value)
       if value.html_safe?