From e12380e7877abb3dafeb7875fb74c272e5cbeee0 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 1 Dec 2009 23:25:24 -0600
Subject: [PATCH] Remove concat before overriding it

---
 .../active_support/core_ext/string/output_safety.rb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 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 2cca4763f4..a2a88eb7df 100644
--- a/activesupport/lib/active_support/core_ext/string/output_safety.rb
+++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb
@@ -7,11 +7,11 @@ def html_safe!
     @_rails_html_safe = true
     self
   end
-  
+
   def html_safe
     dup.html_safe!
   end
-  
+
   alias original_plus +
   def +(other)
     result = original_plus(other)
@@ -21,7 +21,7 @@ def +(other)
       result
     end
   end
-  
+
   alias original_concat <<
   def <<(other)
     result = original_concat(other)
@@ -30,14 +30,15 @@ def <<(other)
     end
     result
   end
-  
+
+  remove_method :concat
   def concat(other)
     self << other
   end
-  
+
   private
     def also_html_safe?(other)
       other.respond_to?(:html_safe?) && other.html_safe?
     end
-  
+
 end
\ No newline at end of file