0
@@ -1,5 +1,7 @@
0
 *SVN*
0
 
0
+* Remove unused ActionController::Base.template_class. Closes #10787 [Pratik]
0
+
0
 * Moved template handlers related code from ActionView::Base to ActionView::Template. [Pratik]
0
 
0
 * Tests for div_for and content_tag_for helpers. Closes #11223 [thechrisoshow]

0
@@ -58,7 +58,6 @@ require 'action_controller/request_forgery_protection'
0
 require 'action_controller/headers'
0
 
0
 require 'action_view'
0
-ActionController::Base.template_class = ActionView::Base
0
 
0
 ActionController::Base.class_eval do
0
   include ActionController::Flash

0
@@ -329,9 +329,6 @@ module ActionController #:nodoc:
0
     # Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers.
0
     cattr_accessor :logger
0
 
0
-    # Determines which template class should be used by ActionController.
0
-    cattr_accessor :template_class
0
-
0
     # Turn on +ignore_missing_templates+ if you want to unit test actions without making the associated templates.
0
     cattr_accessor :ignore_missing_templates
0
 
0
@@ -1122,10 +1119,6 @@ module ActionController #:nodoc:
0
       end
0
       
0
       def initialize_template_class(response)
0
-        unless @@template_class
0
-          raise "You must assign a template class through ActionController.template_class= before processing a request"
0
-        end
0
-
0
         response.template = ActionView::Base.new(self.class.view_paths, {}, self)
0
         response.template.extend self.class.master_helper_module
0
         response.redirected_to = nil
0
@@ -1225,7 +1218,7 @@ module ActionController #:nodoc:
0
       end
0
 
0
       def add_class_variables_to_assigns
0
-        %w(view_paths logger template_class ignore_missing_templates).each do |cvar|
0
+        %w(view_paths logger ignore_missing_templates).each do |cvar|
0
           @assigns[cvar] = self.send(cvar)
0
         end
0
       end

0
@@ -46,22 +46,10 @@ class HelperTest < Test::Unit::TestCase
0
     eval("class #{controller_class_name} < TestController; end")
0
     @controller_class = self.class.const_get(controller_class_name)
0
 
0
-    # Generate new template class and assign to controller.
0
-    template_class_name = "Test#{@symbol}View"
0
-    eval("class #{template_class_name} < ActionView::Base; end")
0
-    @template_class = self.class.const_get(template_class_name)
0
-    @controller_class.template_class = @template_class
0
-
0
     # Set default test helper.
0
     self.test_helper = LocalAbcHelper
0
   end
0
-
0
-  def teardown
0
-    # Reset template class.
0
-    #ActionController::Base.template_class = ActionView::Base
0
-  end
0
-
0
-
0
+  
0
   def test_deprecated_helper
0
     assert_equal expected_helper_methods, missing_methods
0
     assert_nothing_raised { @controller_class.helper TestHelper }