diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-08-07 16:41:58 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-08-07 16:41:58 -0300 |
| commit | d469ad8a49779b3f3d6711989bb334534e94f099 (patch) | |
| tree | c1c5c9bab4a9477595ad357f73c8a8f71825401a | |
| parent | 6b5fab9300c3e5f2852409ad589d2166373787e7 (diff) | |
| download | rails-d469ad8a49779b3f3d6711989bb334534e94f099.tar.gz rails-d469ad8a49779b3f3d6711989bb334534e94f099.tar.bz2 rails-d469ad8a49779b3f3d6711989bb334534e94f099.zip | |
Removed useless OR.
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 7c445f5618..46378edb93 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -2184,7 +2184,7 @@ module ActiveRecord ] else "" - end || '' + end join << %(AND %s) % [ klass.send(:type_condition, aliased_table_name)] unless klass.descends_from_active_record? |