diff options
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 182a23a7d1..cc153c45a7 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -236,6 +236,7 @@ module ActionController #:nodoc: private def apply_layout?(template_with_options, options) + return false if options == :update template_with_options ? candidate_for_layout?(options) : !template_exempt_from_layout? end |