From 4ccf491ec2a09b22827f2c9ba99e311ce18c93eb Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Wed, 8 Sep 2010 15:34:03 -0700 Subject: drying up joins() --- activerecord/lib/active_record/relation/query_methods.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'activerecord') diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 69724ebeeb..038b18079d 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -63,10 +63,8 @@ module ActiveRecord def joins(*args) relation = clone - if args.present? - args.flatten! - relation.joins_values += args if args.present? - end + args.flatten! + relation.joins_values += args unless args.blank? relation end -- cgit v1.2.3