From 9ecaa803001aa95ff9010c8f5aef71c009577ead Mon Sep 17 00:00:00 2001
From: Michael Koziarski <michael@koziarski.com>
Date: Mon, 8 Nov 2010 10:10:30 +1300
Subject: Make safe_append= live on AV::OutputBuffer not AS::SafeBuffer

Conflicts:

	actionpack/lib/action_view/template/handlers/erb.rb
---
 activesupport/lib/active_support/core_ext/string/output_safety.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'activesupport/lib/active_support')

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?
-- 
cgit v1.2.3