diff options
| author | Emilio Tagua <miloops@gmail.com> | 2011-02-15 12:41:57 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2011-02-15 12:41:57 -0300 |
| commit | c13b7c4a0f7ddbd11f7570338cbd669afdb5af13 (patch) | |
| tree | db5c9fb2f444c24c5e69c0104a42d5c98986e3a4 /activerecord/lib | |
| parent | f1778eb44a71595dff271001ee19c7bf6d0a0101 (diff) | |
| download | rails-c13b7c4a0f7ddbd11f7570338cbd669afdb5af13.tar.gz rails-c13b7c4a0f7ddbd11f7570338cbd669afdb5af13.tar.bz2 rails-c13b7c4a0f7ddbd11f7570338cbd669afdb5af13.zip | |
Don't shadow outer local variable.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/associations/class_methods/join_dependency.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/class_methods/join_dependency.rb b/activerecord/lib/active_record/associations/class_methods/join_dependency.rb index fdd4fe8946..ca6467d911 100644 --- a/activerecord/lib/active_record/associations/class_methods/join_dependency.rb +++ b/activerecord/lib/active_record/associations/class_methods/join_dependency.rb @@ -187,8 +187,8 @@ module ActiveRecord construct(parent, association, join_parts, row) end when Hash - associations.sort_by { |k,_| k.to_s }.each do |name, assoc| - association = construct(parent, name, join_parts, row) + associations.sort_by { |k,_| k.to_s }.each do |association_name, assoc| + association = construct(parent, association_name, join_parts, row) construct(association, assoc, join_parts, row) if association end else |