0
@@ -1478,10 +1478,15 @@ module ActiveRecord
0
             join_dependency.joins_for_table_name(table)
0
           }.flatten.compact.uniq
0
 
0
+          order = options[:order]
0
+          if scoped_order = (scope && scope[:order])
0
+            order = order ? "#{order}, #{scoped_order}" : scoped_order
0
+          end
0
+
0
           is_distinct = !options[:joins].blank? || include_eager_conditions?(options, tables_from_conditions) || include_eager_order?(options, tables_from_order)
0
           sql = "SELECT "
0
           if is_distinct
0
-            sql << connection.distinct("#{connection.quote_table_name table_name}.#{primary_key}", options[:order])
0
+            sql << connection.distinct("#{connection.quote_table_name table_name}.#{primary_key}", order)
0
           else
0
             sql << primary_key
0
           end
0
@@ -1495,8 +1500,8 @@ module ActiveRecord
0
           add_conditions!(sql, options[:conditions], scope)
0
           add_group!(sql, options[:group], scope)
0
 
0
-          if options[:order] && is_distinct
0
-            connection.add_order_by_for_association_limiting!(sql, options)
0
+          if order && is_distinct
0
+            connection.add_order_by_for_association_limiting!(sql, :order => order)
0
           else
0
             add_order!(sql, options[:order], scope)
0
           end