From c6db3486c355f4a4fb911d8a8a9ea8043c67b650 Mon Sep 17 00:00:00 2001 From: wycats Date: Tue, 17 Aug 2010 16:50:19 -0700 Subject: 1.8 block variable shadowing strikes again --- activesupport/lib/active_support/dependencies.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activesupport/lib/active_support') 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 -- cgit v1.2.3