diff options
| author | Carl Lerche <carllerche@mac.com> | 2009-05-26 12:06:48 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2009-05-26 12:06:48 -0700 |
| commit | cbb0724f0d0d51a8097ba707517dcf1d09b07a31 (patch) | |
| tree | 9a1278fe0b3a95f0a91e7265cca11e72eef06b9a /actionpack/lib/action_controller/new_base/compatibility.rb | |
| parent | cd8fb1800df0b65b33b1efd5e5159e1810dfe504 (diff) | |
| download | rails-cbb0724f0d0d51a8097ba707517dcf1d09b07a31.tar.gz rails-cbb0724f0d0d51a8097ba707517dcf1d09b07a31.tar.bz2 rails-cbb0724f0d0d51a8097ba707517dcf1d09b07a31.zip | |
In new base Rails2Compatibility, move @template assignment to right before the first action is processed.
Diffstat (limited to 'actionpack/lib/action_controller/new_base/compatibility.rb')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/compatibility.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/new_base/compatibility.rb b/actionpack/lib/action_controller/new_base/compatibility.rb index 4245ba982b..646e69843e 100644 --- a/actionpack/lib/action_controller/new_base/compatibility.rb +++ b/actionpack/lib/action_controller/new_base/compatibility.rb @@ -69,7 +69,12 @@ module ActionController # TODO: Remove this after we flip def template - _action_view + @template ||= _action_view + end + + def process_action(*) + template + super end module ClassMethods @@ -83,11 +88,6 @@ module ActionController @@cache_store = ActiveSupport::Cache.lookup_store(store_option) end end - - def initialize(*) - super - @template = _action_view - end def render_to_body(options) if options.is_a?(Hash) && options.key?(:template) |