diff options
author | Joshua Peek <josh@joshpeek.com> | 2008-07-13 13:26:48 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2008-07-13 13:26:48 -0500 |
commit | e0fef66149092dd3d2988fff64f0ce8765735687 (patch) | |
tree | 76b20ee8e265f74610eb2836be5bc27c300da2a4 /actionpack/lib/action_view/base.rb | |
parent | 99cc85bc099a757cdd44e4f5f1be4972ab124e0d (diff) | |
download | rails-e0fef66149092dd3d2988fff64f0ce8765735687.tar.gz rails-e0fef66149092dd3d2988fff64f0ce8765735687.tar.bz2 rails-e0fef66149092dd3d2988fff64f0ce8765735687.zip |
Made ActionView::Base#first_render a little more private. And added _last_render to track the most recent render. Will fix #609 as a side effect. [#609 state:resolved]
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
-rw-r--r-- | actionpack/lib/action_view/base.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 989e92a890..9f244d7250 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -159,11 +159,11 @@ module ActionView #:nodoc: class Base include ERB::Util - attr_accessor :base_path, :assigns, :template_extension, :first_render + attr_accessor :base_path, :assigns, :template_extension attr_accessor :controller + attr_accessor :_first_render, :_last_render attr_writer :template_format - attr_accessor :current_render_extension attr_accessor :output_buffer @@ -313,7 +313,7 @@ module ActionView #:nodoc: template elsif template = self.view_paths[template_file_name] template - elsif first_render && template = self.view_paths["#{template_file_name}.#{first_render.extension}"] + elsif _first_render && template = self.view_paths["#{template_file_name}.#{_first_render.extension}"] template elsif template_format == :js && template = self.view_paths["#{template_file_name}.html"] @template_format = :html |