diff options
| author | Sam Stephenson <sam@37signals.com> | 2006-01-23 16:29:37 +0000 |
|---|---|---|
| committer | Sam Stephenson <sam@37signals.com> | 2006-01-23 16:29:37 +0000 |
| commit | 4d49f2ca091319b8bc7edcddcfdadffcd5fffca8 (patch) | |
| tree | 9eb683bacc2fa9b6f3839ff445b58877cbbcedf5 /actionpack/lib/action_controller/layout.rb | |
| parent | 5f44411d948f0cefb6a968a357d305c4c97c2174 (diff) | |
| download | rails-4d49f2ca091319b8bc7edcddcfdadffcd5fffca8.tar.gz rails-4d49f2ca091319b8bc7edcddcfdadffcd5fffca8.tar.bz2 rails-4d49f2ca091319b8bc7edcddcfdadffcd5fffca8.zip | |
Fix render(:update) to not render layouts
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3472 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
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 |