diff options
| author | José Valim <jose.valim@gmail.com> | 2010-06-22 23:52:12 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-06-22 23:52:12 +0200 |
| commit | e5444f84dfa0237b1ffa758c940723852f366a9c (patch) | |
| tree | 46121dcdf0ef2e29e0018999d13f3b2ba1e13a9b /actionpack | |
| parent | aacb83143f24ff44c046d18930270d650efffec5 (diff) | |
| download | rails-e5444f84dfa0237b1ffa758c940723852f366a9c.tar.gz rails-e5444f84dfa0237b1ffa758c940723852f366a9c.tar.bz2 rails-e5444f84dfa0237b1ffa758c940723852f366a9c.zip | |
Stop filling the blocks scope array with nil.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 77740b0f53..2005382b8e 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -418,7 +418,9 @@ module ActionDispatch end def merge_blocks_scope(parent, child) - (parent || []) + [child] + merged = parent ? parent.dup : [] + merged << child if child + merged end def merge_options_scope(parent, child) |