diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-14 16:47:31 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-14 16:47:31 -0800 |
| commit | 17687e4f969af363edf2854dd0c49914098dfda4 (patch) | |
| tree | e8593e537687c402337463eb0900feb061219ab0 /activerecord/lib/active_record/associations | |
| parent | 2afd6c75f18aee67fab85efef2b970572d459db3 (diff) | |
| download | rails-17687e4f969af363edf2854dd0c49914098dfda4.tar.gz rails-17687e4f969af363edf2854dd0c49914098dfda4.tar.bz2 rails-17687e4f969af363edf2854dd0c49914098dfda4.zip | |
@target is always a list, so stop doing is_a? checks
Diffstat (limited to 'activerecord/lib/active_record/associations')
| -rw-r--r-- | activerecord/lib/active_record/associations/association_collection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_collection.rb b/activerecord/lib/active_record/associations/association_collection.rb index 60a8d71d26..9490f5401c 100644 --- a/activerecord/lib/active_record/associations/association_collection.rb +++ b/activerecord/lib/active_record/associations/association_collection.rb @@ -352,7 +352,7 @@ module ActiveRecord if !@owner.new_record? || foreign_key_present? unless loaded? begin - if @target.is_a?(Array) && @target.any? + if @target.any? @target = merge_target_lists(find_target, @target) else @target = find_target |