From a505c82d2f4642a16b08a3cbead0a12a22508eba Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 9 Sep 2010 09:44:01 -0700 Subject: no need for Array.wrap, also avoid array creation --- activerecord/lib/active_record/relation/query_methods.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/relation/query_methods.rb b/activerecord/lib/active_record/relation/query_methods.rb index 23610ae016..5179fa2188 100644 --- a/activerecord/lib/active_record/relation/query_methods.rb +++ b/activerecord/lib/active_record/relation/query_methods.rb @@ -130,7 +130,7 @@ module ActiveRecord modules << Module.new(&block) if block_given? relation = clone - relation.send(:apply_modules, *modules) + relation.send(:apply_modules, modules.flatten) relation end @@ -276,10 +276,9 @@ module ActiveRecord end def apply_modules(modules) - if modules.present? - values = Array.wrap(modules) - @extensions += values - values.each {|extension| extend(extension) } + unless modules.empty? + @extensions.concat modules + modules.each {|extension| extend(extension) } end end -- cgit v1.2.3