aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations/has_many_association.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/has_many_association.rb b/activerecord/lib/active_record/associations/has_many_association.rb
index 4a9d773ac7..6ed2782b0b 100644
--- a/activerecord/lib/active_record/associations/has_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_many_association.rb
@@ -66,6 +66,7 @@ module ActiveRecord
end
else
options[:conditions] = @finder_sql + (options[:conditions] ? " AND #{options[:conditions]}" : "")
+ options[:order] = options[:order] ? "#{options[:order]}, #{@options[:order]}" : @options[:order]
@association_class.find(args.size == 1 ? args.first : args, options)
end
end