aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-03-12 13:32:52 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-03-12 13:32:52 -0700
commit5f1d6465b47333db730a4bb4ac3d2a083b7c8f3c (patch)
treecfb69e4784957998a0e3f2d1b6c8012d291c17d8 /actionpack
parent82c6597dc244715c40151c7eb10f2016ed5ebb47 (diff)
downloadrails-5f1d6465b47333db730a4bb4ac3d2a083b7c8f3c.tar.gz
rails-5f1d6465b47333db730a4bb4ac3d2a083b7c8f3c.tar.bz2
rails-5f1d6465b47333db730a4bb4ac3d2a083b7c8f3c.zip
Change naming to match 2.2 so life is easier on plugin developers
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/base.rb10
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)