diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-21 09:06:40 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-02-21 09:06:40 -0800 |
| commit | fd74cd78885080b00722749c4746a0aefd897e5c (patch) | |
| tree | 6e665acff40441b0aaf6b87bdcfc428e3a397ce3 /actionpack/lib/abstract_controller/layouts.rb | |
| parent | 92a7296a5deb109d054b32d96fa1a74f0859a81b (diff) | |
| parent | c0ec40c83a7e2370f0f4a01055aafb69026d8099 (diff) | |
| download | rails-fd74cd78885080b00722749c4746a0aefd897e5c.tar.gz rails-fd74cd78885080b00722749c4746a0aefd897e5c.tar.bz2 rails-fd74cd78885080b00722749c4746a0aefd897e5c.zip | |
Merge pull request #5116 from rubenfonseca/delete_with_block_refactor
Refactored two methods to use delete with a block
Diffstat (limited to 'actionpack/lib/abstract_controller/layouts.rb')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index 6a6387632c..aa39e21ba9 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -322,7 +322,7 @@ module AbstractController super if _include_layout?(options) - layout = options.key?(:layout) ? options.delete(:layout) : :default + layout = options.delete(:layout) { :default } options[:layout] = _layout_for_option(layout) end end |