=== modified file 'vendor/rails/actionpack/lib/action_controller/layout.rb'
--- vendor/rails/actionpack/lib/action_controller/layout.rb	2009-04-03 13:23:10 +0000
+++ vendor/rails/actionpack/lib/action_controller/layout.rb	2009-04-07 15:19:32 +0000
@@ -257,7 +257,12 @@
       end
 
       def candidate_for_layout?(options)
-        template = options[:template] || default_template(options[:action])
+        if options.has_key?(:action)
+          template = options[:template] || default_template(options[:action])
+        else
+          template = options[:template] || default_template()
+        end
+
         if options.values_at(:text, :xml, :json, :file, :inline, :partial, :nothing, :update).compact.empty?
           begin
             template_object = self.view_paths.find_template(template, default_template_format)