diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2010-06-08 18:00:43 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-06-08 19:33:27 +0200 |
| commit | a7edddf605d2ffbb6669365dcd23d6e4c6c2cf84 (patch) | |
| tree | f6312ad53906fb488dd52e0ab61d8eadae1b2710 /actionpack/lib/action_dispatch | |
| parent | 47bf19c8485ecead7280019c4815a2ed4f2161d5 (diff) | |
| download | rails-a7edddf605d2ffbb6669365dcd23d6e4c6c2cf84.tar.gz rails-a7edddf605d2ffbb6669365dcd23d6e4c6c2cf84.tar.bz2 rails-a7edddf605d2ffbb6669365dcd23d6e4c6c2cf84.zip | |
Fix resources ignoring scope options
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index e441b856e1..e91a72cbe5 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -581,6 +581,7 @@ module ActionDispatch def resource(*resources, &block) options = resources.extract_options! + options = (@scope[:options] || {}).merge(options) if apply_common_behavior_for(:resource, resources, options, &block) return self @@ -611,6 +612,7 @@ module ActionDispatch def resources(*resources, &block) options = resources.extract_options! + options = (@scope[:options] || {}).merge(options) if apply_common_behavior_for(:resources, resources, options, &block) return self |