Fix performance regression

2 files changed, 6 insertions, 2 deletions

diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
index 88ee07d95b..9d1e0d3ac5 100644
--- a/actionpack/lib/action_view/template.rb
+++ b/actionpack/lib/action_view/template.rb
@@ -204,7 +204,7 @@ module ActionView #:nodoc:
 
     private
       def valid_extension?(extension)
-        Template.template_handler_extensions.include?(extension)
+        !Template.registered_template_handler(extension).nil?
       end
 
       def find_full_path(path, load_paths)
diff --git a/actionpack/lib/action_view/template_handlers.rb b/actionpack/lib/action_view/template_handlers.rb
index d06ddd5fb5..205f8628f0 100644
--- a/actionpack/lib/action_view/template_handlers.rb
+++ b/actionpack/lib/action_view/template_handlers.rb
@@ -32,13 +32,17 @@ module ActionView #:nodoc:
       @@template_handlers.keys.map(&:to_s).sort
     end
 
+    def registered_template_handler(extension)
+      extension && @@template_handlers[extension.to_sym]
+    end
+
     def register_default_template_handler(extension, klass)
       register_template_handler(extension, klass)
       @@default_template_handlers = klass
     end
 
     def handler_class_for_extension(extension)
-      (extension && @@template_handlers[extension.to_sym]) || @@default_template_handlers
+      registered_template_handler(extension) || @@default_template_handlers
     end
   end
 end