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: [PATCH] Make safe_append= live on AV::OutputBuffer not AS::SafeBuffer

Conflicts:

	actionpack/lib/action_view/template/handlers/erb.rb
---
 actionpack/lib/action_view/template/handlers/erb.rb              | 1 +
 .../lib/active_support/core_ext/string/output_safety.rb          | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 4c1f3d70ca..0803114f44 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -15,6 +15,7 @@ module ActionView
       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
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?