diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-13 01:10:39 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-13 01:10:39 -0700 |
commit | 7e6c310b052f9521e48f37341d42f618e004d692 (patch) | |
tree | 5fd24c8541add2419fa9a7aa3230cf049b022b65 /actionpack | |
parent | 3d260760f035c5aab11ab218881ed36e3046157b (diff) | |
parent | 5f1d6465b47333db730a4bb4ac3d2a083b7c8f3c (diff) | |
download | rails-7e6c310b052f9521e48f37341d42f618e004d692.tar.gz rails-7e6c310b052f9521e48f37341d42f618e004d692.tar.bz2 rails-7e6c310b052f9521e48f37341d42f618e004d692.zip |
Merge branch 'master' into bodyparts
Conflicts:
actionpack/lib/action_view/base.rb
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_view/base.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 0f396817a5..e19acc5c29 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -225,8 +225,8 @@ module ActionView #:nodoc: @helpers = ProxyModule.new(self) self.view_paths = view_paths - @_first_template = nil - @_current_template = nil + @_first_render = nil + @_current_render = nil end attr_reader :view_paths @@ -288,12 +288,12 @@ module ActionView #:nodoc: # Access the current template being rendered. # Returns a ActionView::Template object. def template - @_current_template + @_current_render end def template=(template) #:nodoc: - @_first_template ||= template - @_current_template = template + @_first_render ||= template + @_current_render = template end def with_template(current_template) |