From beeb9529b8be771830fcc488aa73cee2d9f8e40b Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Fri, 23 Nov 2012 19:47:05 -0200 Subject: Normalize scope recovering :blocks option name Use the same :blocks key in the recover hash to revert the scope options later. --- actionpack/lib/action_dispatch/routing/mapper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actionpack/lib') 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 -- cgit v1.2.3