diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-22 11:26:03 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-22 11:26:03 +0000 |
commit | 8b5f4e474f30560da85f52dd64dc3b45d0338b93 (patch) | |
tree | 0ba6fdc63093d9cc5549498d9f62238bea80a4cf /activerecord/lib/active_record/associations/has_many_association.rb | |
parent | dc901ced448179d9dfec924e22d8444b1a75265c (diff) | |
download | rails-8b5f4e474f30560da85f52dd64dc3b45d0338b93.tar.gz rails-8b5f4e474f30560da85f52dd64dc3b45d0338b93.tar.bz2 rails-8b5f4e474f30560da85f52dd64dc3b45d0338b93.zip |
Ruby 1.9 compat: fix warnings, shadowed block vars, and unitialized instance vars
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8481 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/has_many_association.rb')
-rw-r--r-- | activerecord/lib/active_record/associations/has_many_association.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb index ead447baa0..f134ae0757 100644 --- a/activerecord/lib/active_record/associations/has_many_association.rb +++ b/activerecord/lib/active_record/associations/has_many_association.rb @@ -41,10 +41,10 @@ module ActiveRecord if ids.size == 1 id = ids.first - record = load_target.detect { |record| id == record.id } + record = load_target.detect { |r| id == r.id } expects_array ? [ record ] : record else - load_target.select { |record| ids.include?(record.id) } + load_target.select { |r| ids.include?(r.id) } end else conditions = "#{@finder_sql}" |