From: Tom Hughes <tom@compton.nu>
Date: Sun, 7 Jun 2009 16:52:10 +0000 (+0000)
Subject: Backout pagintion change as the included models are sometimes needed...
X-Git-Tag: live~6871^2~25
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/4eb13dac19e7565ba1de6ab7614721360a8a8f6c

Backout pagintion change as the included models are sometimes needed...
---

diff --git a/vendor/plugins/classic_pagination/lib/pagination.rb b/vendor/plugins/classic_pagination/lib/pagination.rb
index 140a7d79b..6a3e1a97b 100644
--- a/vendor/plugins/classic_pagination/lib/pagination.rb
+++ b/vendor/plugins/classic_pagination/lib/pagination.rb
@@ -175,6 +175,7 @@ module ActionController
     def count_collection_for_pagination(model, options)
       model.count(:conditions => options[:conditions],
                   :joins => options[:join] || options[:joins],
+                  :include => options[:include],
                   :select => (options[:group] ? "DISTINCT #{options[:group]}" : options[:count]))
     end