diff options
author | german <e2718281828@ya.ru> | 2011-02-04 11:51:34 -0500 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-02-04 17:07:51 -0200 |
commit | adbae9aab8a439a824cf1612febb5918d0f4cf87 (patch) | |
tree | c69cc6f374bbdea09dda835487f68ba9baf73a41 /actionpack/lib | |
parent | 94175c0e39ae9fc8d22dc2c2c55f16c1d92f4090 (diff) | |
download | rails-adbae9aab8a439a824cf1612febb5918d0f4cf87.tar.gz rails-adbae9aab8a439a824cf1612febb5918d0f4cf87.tar.bz2 rails-adbae9aab8a439a824cf1612febb5918d0f4cf87.zip |
fixed bug with nested resources within shallow scope
[#6372 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index b28b68ad83..c38e9ef2c4 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1199,7 +1199,7 @@ module ActionDispatch end def shallow - scope(:shallow => true) do + scope(:shallow => true, :shallow_path => @scope[:path]) do yield end end |