Remove code duplication by moving logic to check_if_method_has_arguments!

Author: rafaelfranca

activerecord/lib/active_record/relation/query_methods.rb

@@ -1606,8 +1606,6 @@ def sanitize_order_arguments(order_args)
         order_args.map! do |arg|
           klass.sanitize_sql_for_order(arg)
         end
-        order_args.flatten!
-        order_args.compact_blank!
       end
 
       def column_references(order_args)
@@ -1676,9 +1674,9 @@ def resolve_arel_attributes(attrs)
       def check_if_method_has_arguments!(method_name, args, message = nil)
         if args.blank?
           raise ArgumentError, message || "The method .#{method_name}() must contain arguments."
-        elsif block_given?
-          yield args
         else
+          yield args if block_given?
+
           args.flatten!
           args.compact_blank!
         end