diff options
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index c41e14736c..27ff16c835 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -277,8 +277,8 @@ module ActionController #:nodoc: def candidate_for_layout?(options) (options.has_key?(:layout) && options[:layout] != false) || - options.values_at(:text, :xml, :json, :file, :inline, :partial, :nothing).compact.empty? && - !template_exempt_from_layout?(default_template_name(options[:action] || options[:template])) + options.values_at(:text, :xml, :json, :file, :inline, :partial, :nothing).compact.empty? && + !template_exempt_from_layout?(options[:template] || default_template_name(options[:action])) end def pick_layout(template_with_options, options) @@ -320,4 +320,4 @@ module ActionController #:nodoc: end end end -end
\ No newline at end of file +end |