Fetch OpenLayers from the same server as the embed page

[rails.git] / vendor / plugins / classic_pagination / lib / pagination.rb

diff --git a/vendor/plugins/classic_pagination/lib/pagination.rb b/vendor/plugins/classic_pagination/lib/pagination.rb
index 140a7d79bb9d2310c0650c12420011ef98e65fa8..6a3e1a97b0f661cb63937fc8bbcc6b0b6c533a38 100644 (file)
--- 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