Fix rendering of layouts.

2 files changed, 2 insertions, 6 deletions

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 1dec3f2c3e..40cac40ba7 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -157,7 +157,8 @@ module AbstractController
         options[:_template_name] = options[:file]
       end
 
-      name = (options[:_template_name] || action_name).to_s
+      name = (options[:_template_name] || options[:action] || action_name).to_s
+      options[:_prefix] ||= _prefix if (options.keys & [:partial, :file, :template]).empty?
 
       options[:_template] ||= with_template_cache(name) do
         find_template(name, { :formats => formats }, options)
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 8f03035b2b..0aae9f8579 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -58,11 +58,6 @@ module ActionController
           options.merge! :partial => action
         end
 
-        if (options.keys & [:partial, :file, :template, :text, :inline]).empty?
-          options[:_template_name] ||= options[:action]
-          options[:_prefix] = _prefix
-        end
-
         if options[:status]
           options[:status] = Rack::Utils.status_code(options[:status])
         end