diff options
| author | wycats <wycats@gmail.com> | 2010-08-17 16:50:19 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-08-17 16:51:35 -0700 |
| commit | c6db3486c355f4a4fb911d8a8a9ea8043c67b650 (patch) | |
| tree | 722f91b880f2271c8976c5d099e622709bedefa6 /activesupport | |
| parent | dbe08026e11644be1465b84824df26449286a565 (diff) | |
| download | rails-c6db3486c355f4a4fb911d8a8a9ea8043c67b650.tar.gz rails-c6db3486c355f4a4fb911d8a8a9ea8043c67b650.tar.bz2 rails-c6db3486c355f4a4fb911d8a8a9ea8043c67b650.zip | |
1.8 block variable shadowing strikes again
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 38727f77ee..e6170b2daf 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -104,8 +104,8 @@ module ActiveSupport #:nodoc: # element of self[Object] will be an Array of the constants that were present # before parent.rb was required. The second element will be an Array of the # constants that were present before child.rb was required. - self[namespace].each do |constants| - constants.concat(new_constants) + self[namespace].each do |namespace_constants| + namespace_constants.concat(new_constants) end # Normalize the list of new constants, and add them to the list we will return |