From 301b92370a3e27f9ffd40c64824bc7e8313541fb Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 23 May 2007 08:00:35 +0000 Subject: Extend the view instance directly instead of mucking with anonymous subclasses. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6821 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/base.rb | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index b2ad440997..dc5a1d18cd 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1075,19 +1075,11 @@ module ActionController #:nodoc: end private - def self.view_class - unless defined? @view_class - # Create a template subclass including helper methods. - @view_class = Class.new(ActionView::Base) - @view_class.send(:include, master_helper_module) - end - @view_class - end - def initialize_template_class(response) raise "You must assign a template class through ActionController.template_class= before processing a request" unless @@template_class - response.template = self.class.view_class.new(view_paths, {}, self) + response.template = ActionView::Base.new(view_paths, {}, self) + response.template.extend self.class.master_helper_module response.redirected_to = nil @performed_render = @performed_redirect = false end -- cgit v1.2.3