diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-23 19:47:05 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-24 09:19:20 -0200 |
| commit | beeb9529b8be771830fcc488aa73cee2d9f8e40b (patch) | |
| tree | 6d30dc2f22b89232ab550692992862178995a239 /actionpack/lib | |
| parent | 5b9f983c65dcca590d5ff309cea4def61209790d (diff) | |
| download | rails-beeb9529b8be771830fcc488aa73cee2d9f8e40b.tar.gz rails-beeb9529b8be771830fcc488aa73cee2d9f8e40b.tar.bz2 rails-beeb9529b8be771830fcc488aa73cee2d9f8e40b.zip | |
Normalize scope recovering :blocks option name
Use the same :blocks key in the recover hash to revert the scope options
later.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index df4c95d909..567a014060 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -660,8 +660,8 @@ module ActionDispatch end end - recover[:block] = @scope[:blocks] - @scope[:blocks] = merge_blocks_scope(@scope[:blocks], block) + recover[:blocks] = @scope[:blocks] + @scope[:blocks] = merge_blocks_scope(@scope[:blocks], block) recover[:options] = @scope[:options] @scope[:options] = merge_options_scope(@scope[:options], options) @@ -674,7 +674,7 @@ module ActionDispatch end @scope[:options] = recover[:options] - @scope[:blocks] = recover[:block] + @scope[:blocks] = recover[:blocks] end # Scopes routes to a specific controller |