From 6b5fab9300c3e5f2852409ad589d2166373787e7 Mon Sep 17 00:00:00 2001 From: Emilio Tagua Date: Fri, 7 Aug 2009 14:33:35 -0300 Subject: Don't scope order in calculations.' --- activerecord/lib/active_record/calculations.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activerecord/lib/active_record/calculations.rb') diff --git a/activerecord/lib/active_record/calculations.rb b/activerecord/lib/active_record/calculations.rb index 3c75200f82..43e4529575 100644 --- a/activerecord/lib/active_record/calculations.rb +++ b/activerecord/lib/active_record/calculations.rb @@ -155,7 +155,7 @@ module ActiveRecord relation.where(construct_conditions(options[:conditions], scope)) relation.where(construct_arel_limited_ids_condition(options, join_dependency)) if join_dependency && !using_limitable_reflections?(join_dependency.reflections) && ((scope && scope[:limit]) || options[:limit]) - relation.order(construct_order(options[:order], scope)) + relation.order(options[:order]) relation.take(options[:limit]) relation.skip(options[:offset]) -- cgit v1.2.3