Revert "Moved TemplateHandlers to Base"

This reverts commit 42d215a925a228778e43f7040f03ad8f3eb5341c.

Conflicts:

	actionpack/lib/action_view/inline_template.rb
	actionpack/lib/action_view/template.rb

1 files changed, 2 insertions, 6 deletions

diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 8142232c8f..dbc8ccdee8 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -1,12 +1,8 @@
 module ActionView #:nodoc:
   class Template #:nodoc:
+    extend TemplateHandlers
     include Renderer
 
-    class << self
-      # TODO: Deprecate
-      delegate :register_template_handler, :to => 'ActionView::Base'
-    end
-
     attr_reader :path, :extension
 
     def initialize(view, path, use_full_path = nil, locals = {})
@@ -25,7 +21,7 @@ module ActionView #:nodoc:
 
       @method_key = @filename
       @locals = locals || {}
-      @handler = Base.handler_class_for_extension(@extension).new(@view)
+      @handler = self.class.handler_class_for_extension(@extension).new(@view)
     end
 
     def render_template