diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-30 22:59:24 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-09-30 22:59:24 +0000 |
| commit | 860cf2d44e01114af8ce83fffee3689df812a55c (patch) | |
| tree | 35e3291052fb24eb13e3ca712ee0cebac6a9b6df /actionpack/lib/action_controller | |
| parent | 6ca789bf005caadd4200b6bf788521dfe1d40287 (diff) | |
| download | rails-860cf2d44e01114af8ce83fffee3689df812a55c.tar.gz rails-860cf2d44e01114af8ce83fffee3689df812a55c.tar.bz2 rails-860cf2d44e01114af8ce83fffee3689df812a55c.zip | |
Fixed that render template did not honor exempt_from_layout (closes #9698) [pezra]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7701 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -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 |