Move layout lookup to views.

1 files changed, 5 insertions, 3 deletions

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index df33e8b480..8125badc75 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -15,10 +15,12 @@ module AbstractController
 
     included do
       class_attribute :_view_paths
-      delegate :_view_paths, :to => :'self.class'
       self._view_paths = ActionView::PathSet.new
     end
 
+    delegate :formats, :formats=, :to => :template_lookup
+    delegate :_view_paths, :to => :'self.class'
+
     # An instance of a view class. The default view class is ActionView::Base
     #
     # The view class must have the following methods:
@@ -180,11 +182,11 @@ module AbstractController
     end
 
     def details_for_render
-      { :formats => formats, :locale => [I18n.locale] }
+      {  }
     end
 
     def _normalize_details(options)
-      details = details_for_render
+      details = template_lookup.details
       details[:formats] = Array(options[:format]) if options[:format]
       details[:locale]  = Array(options[:locale]) if options[:locale]
       details