diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-11-17 13:10:23 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-11-17 13:10:23 +0000 |
commit | 96cca7db6dd2022d74fd94eb532ceacc8913b57b (patch) | |
tree | 98f4ba262dc540b405542dd430d55b9a17a6ae91 /actionpack/lib/action_view | |
parent | 495f113e57c5b5db883c9a395aa80f8ccfc171bf (diff) | |
download | rails-96cca7db6dd2022d74fd94eb532ceacc8913b57b.tar.gz rails-96cca7db6dd2022d74fd94eb532ceacc8913b57b.tar.bz2 rails-96cca7db6dd2022d74fd94eb532ceacc8913b57b.zip |
ActionView::Base.erb_variable accessor names the buffer variable used to render templates. Defaults to _erbout; use _buf for erubis.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5544 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r-- | actionpack/lib/action_view/base.rb | 3 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/capture_helper.rb | 8 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 1342db058d..efd2824236 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -183,6 +183,9 @@ module ActionView #:nodoc: # that alert()s the caught exception (and then re-raises it). @@debug_rjs = false cattr_accessor :debug_rjs + + @@erb_variable = '_erbout' + cattr_accessor :erb_variable @@template_handlers = HashWithIndifferentAccess.new diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb index 497ce093eb..1d6ad56004 100644 --- a/actionpack/lib/action_view/helpers/capture_helper.rb +++ b/actionpack/lib/action_view/helpers/capture_helper.rb @@ -56,15 +56,15 @@ module ActionView def capture(*args, &block) # execute the block begin - buffer = eval("_erbout", block.binding) + buffer = eval(ActionView::Base.erb_variable, block.binding) rescue buffer = nil end if buffer.nil? - capture_block(*args, &block) + capture_block(*args, &block).to_s else - capture_erb_with_buffer(buffer, *args, &block) + capture_erb_with_buffer(buffer, *args, &block).to_s end end @@ -99,7 +99,7 @@ module ActionView end def capture_erb(*args, &block) - buffer = eval("_erbout", block.binding) + buffer = eval(ActionView::Base.erb_variable, block.binding) capture_erb_with_buffer(buffer, *args, &block) end diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index c5b757d6e1..8f956133b7 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -23,7 +23,7 @@ module ActionView # is equivalent to using: # <%= "hello" %> def concat(string, binding) - eval("_erbout", binding).concat(string) + eval(ActionView::Base.erb_variable, binding) << string end # If +text+ is longer than +length+, +text+ will be truncated to the length of |