aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/template/handlers/erb.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-04-16 02:10:36 +0200
committerJosé Valim <jose.valim@gmail.com>2011-04-16 02:10:36 +0200
commit2dd43c3f804176d114cdbfeb8a0f92a43155baee (patch)
tree04e0669c9c4958baa1289d79431553fb15a0f31e /actionpack/lib/action_view/template/handlers/erb.rb
parentfad214b9e1c0a66f8fecde48fbd8d122e5c51e33 (diff)
downloadrails-2dd43c3f804176d114cdbfeb8a0f92a43155baee.tar.gz
rails-2dd43c3f804176d114cdbfeb8a0f92a43155baee.tar.bz2
rails-2dd43c3f804176d114cdbfeb8a0f92a43155baee.zip
Buffer should be an option passed down to template rendering.
Diffstat (limited to 'actionpack/lib/action_view/template/handlers/erb.rb')
-rw-r--r--actionpack/lib/action_view/template/handlers/erb.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 0443b1b0f5..4af576a688 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -22,7 +22,7 @@ module ActionView
module Handlers
class Erubis < ::Erubis::Eruby
def add_preamble(src)
- src << "@output_buffer = ActionView::OutputBuffer.new;"
+ src << "@output_buffer = output_buffer || ActionView::OutputBuffer.new;"
end
def add_text(src, text)