diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 18:08:45 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-17 18:08:45 -0700 |
| commit | a9ad763c86e110c280be0b7a763496f9e1204de0 (patch) | |
| tree | f3f6fe2d86a4536cae6f1a9a7ddf73d67c59f2e0 /actionpack/lib/action_view/base.rb | |
| parent | 65102c8f1a55c8d73e44b62eed5e689017ace7cd (diff) | |
| download | rails-a9ad763c86e110c280be0b7a763496f9e1204de0.tar.gz rails-a9ad763c86e110c280be0b7a763496f9e1204de0.tar.bz2 rails-a9ad763c86e110c280be0b7a763496f9e1204de0.zip | |
Drive the final stake through @content_for_*'s heart!
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 1ca6f839a8..b994c7b141 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -170,12 +170,13 @@ module ActionView #:nodoc: attr_accessor :base_path, :assigns, :template_extension, :formats attr_accessor :controller + attr_internal :captures attr_accessor :output_buffer class << self delegate :erb_trim_mode=, :to => 'ActionView::TemplateHandlers::ERB' - delegate :logger, :to => 'ActionController::Base' + delegate :logger, :to => 'ActionController::Base', :allow_nil => true end @@debug_rjs = false @@ -232,6 +233,7 @@ module ActionView #:nodoc: @assigns = assigns_for_first_render @controller = controller @helpers = ProxyModule.new(self) + @_content_for = Hash.new {|h,k| h[k] = "" } self.view_paths = view_paths end |