From 64ad8f8c13742486301ccc532d4d4bdfea2047c2 Mon Sep 17 00:00:00 2001 From: Marcelo Giorgi Date: Wed, 15 Sep 2010 22:35:07 -0300 Subject: [PATCH 2/2] Preserving :include options for hmt association with an order but without conditions [#5262 state:resolved] --- .../lib/active_record/association_preload.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/activerecord/lib/active_record/association_preload.rb b/activerecord/lib/active_record/association_preload.rb index c2206dc..7acc415 100644 --- a/activerecord/lib/active_record/association_preload.rb +++ b/activerecord/lib/active_record/association_preload.rb @@ -283,7 +283,7 @@ module ActiveRecord through_records.flatten! else options = {} - options[:include] = reflection.options[:include] || reflection.options[:source] if reflection.options[:conditions] + options[:include] = reflection.options[:include] || reflection.options[:source] if reflection.options[:conditions] || reflection.options[:order] options[:order] = reflection.options[:order] options[:conditions] = reflection.options[:conditions] records.first.class.preload_associations(records, through_association, options) -- 1.7.0.4