aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base/base.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-04-30 17:26:03 -0500
committerJoshua Peek <josh@joshpeek.com>2009-04-30 17:26:03 -0500
commit00d1a57e9f99a1b2439281cb741fd82ef47a5c55 (patch)
tree3fafedd0ef5870df4c8d603aab7dadf3f833a977 /actionpack/lib/action_controller/base/base.rb
parent64e66cf161ee8db0bdbccb1be18fb760f5a9d24e (diff)
downloadrails-00d1a57e9f99a1b2439281cb741fd82ef47a5c55.tar.gz
rails-00d1a57e9f99a1b2439281cb741fd82ef47a5c55.tar.bz2
rails-00d1a57e9f99a1b2439281cb741fd82ef47a5c55.zip
Start moving TestRequest and TestResponse into ActionDispatch
Diffstat (limited to 'actionpack/lib/action_controller/base/base.rb')
-rw-r--r--actionpack/lib/action_controller/base/base.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb
index 14c4339c94..99b5963891 100644
--- a/actionpack/lib/action_controller/base/base.rb
+++ b/actionpack/lib/action_controller/base/base.rb
@@ -817,7 +817,8 @@ module ActionController #:nodoc:
end
def initialize_template_class(response)
- @template = response.template = ActionView::Base.new(self.class.view_paths, {}, self, formats)
+ @template = ActionView::Base.new(self.class.view_paths, {}, self, formats)
+ response.template = @template if response.respond_to?(:template=)
@template.helpers.send :include, self.class.master_helper_module
response.redirected_to = nil
@performed_render = @performed_redirect = false