diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-30 15:49:56 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-30 15:49:56 -0700 |
| commit | f7d9e09eeec0ff24d19dfcf926555c58918b1bcc (patch) | |
| tree | f4fd883612e90b4b684672e2428f0ddbf0496a62 /actionpack/lib/action_controller/layout.rb | |
| parent | b163d83b8bab9103dc0e73b86212c2629cb45ca2 (diff) | |
| parent | 4fb75392aa12228764758dfda95f02f83b8ce3fe (diff) | |
| download | rails-f7d9e09eeec0ff24d19dfcf926555c58918b1bcc.tar.gz rails-f7d9e09eeec0ff24d19dfcf926555c58918b1bcc.tar.bz2 rails-f7d9e09eeec0ff24d19dfcf926555c58918b1bcc.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 8b6febe254..fd743ced38 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -245,7 +245,7 @@ module ActionController #:nodoc: template_with_options = options.is_a?(Hash) if (layout = pick_layout(template_with_options, options)) && apply_layout?(template_with_options, options) - options = options.merge :layout => false if template_with_options + options.delete(:layout) if template_with_options logger.info("Rendering template within #{layout}") if logger content_for_layout = render_with_no_layout(options, extra_options, &block) |