From 933697a5fc5f4c56c4fd7fbbd31b8973df9c1054 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 2 Jun 2008 09:12:00 -0700
Subject: Try replacing _erbout with @output_buffer

---
 actionpack/lib/action_view/helpers/text_helper.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'actionpack/lib/action_view/helpers/text_helper.rb')

diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index 669a285424..4711b84ae7 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -25,8 +25,12 @@ module ActionView
       #       end
       #       # will either display "Logged in!" or a login link
       #   %>
-      def concat(string, binding)
-        eval(ActionView::Base.erb_variable, binding) << string
+      def concat(string, binding = nil)
+        if @output_buffer
+          @output_buffer << string
+        else
+          string
+        end
       end
 
       if RUBY_VERSION < '1.9'
-- 
cgit v1.2.3