aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/text_helper.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-06-02 09:12:00 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-06-02 21:32:50 -0700
commit933697a5fc5f4c56c4fd7fbbd31b8973df9c1054 (patch)
tree44f55a5c801e94db8c3637c73dfc6db7f2c3350d /actionpack/lib/action_view/helpers/text_helper.rb
parentda91450e687fe9faa7b0575062c2b2aacc261f68 (diff)
downloadrails-933697a5fc5f4c56c4fd7fbbd31b8973df9c1054.tar.gz
rails-933697a5fc5f4c56c4fd7fbbd31b8973df9c1054.tar.bz2
rails-933697a5fc5f4c56c4fd7fbbd31b8973df9c1054.zip
Try replacing _erbout with @output_buffer
Diffstat (limited to 'actionpack/lib/action_view/helpers/text_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/text_helper.rb8
1 files changed, 6 insertions, 2 deletions
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'