Combining associations and include fails

Here is a patch with tests revealing the problem. The first test tests that this works in the case of e.g. Workers.paginate, the second (failing) test tests the combination of associations and include.

I'm putting the patch inline since lighthouse won't attach anything right now.

diff --git a/vendor/plugins/will_paginate/test/finder_test.rb b/vendor/plugins/will_paginate/test/finder_test.rb
index b69c442..f91edaf 100644
--- a/vendor/plugins/will_paginate/test/finder_test.rb
+++ b/vendor/plugins/will_paginate/test/finder_test.rb
@@ -125,6 +125,37 @@ class FinderTest < ActiveRecordTestCase
     assert_equal expected, entries.to_a
   end
 
+  def test_paginate_with_include_and_conditions
+    entries = Topic.paginate \
+      :page     => 1, 
+      :include  => :replies,  
+      :conditions => "replies.content LIKE 'Bird%' ", 
+      :per_page => 10
+
+    expected = Topic.find :all, 
+      :include => 'replies', 
+      :conditions => "replies.content LIKE 'Bird%' ", 
+      :limit   => 10
+
+    assert_equal expected, entries.to_a
+  end
+
+  def test_paginate_associations_with_include
+    project = projects :active_record
+    project.topics.paginate \
+      :page     => 1, 
+      :include  => :replies,  
+      :conditions => "replies.content LIKE 'Nice%' ", 
+      :per_page => 10
+
+    expected = Topic.find :all, 
+      :include => 'replies', 
+      :conditions => "project_id = #{project.id} AND replies.content LIKE 'Nice%' ", 
+      :limit   => 10
+
+    assert_equal expected, entries.to_a
+  end
+
   def test_paginate_with_group
     entries = Developer.paginate :page => 1, :per_page => 10, :group => 'salary'
     expected = [ users(:david), users(:jamis), users(:dev_10), users(:poor_jamis) ].map(&:salary).sort

It seems this is due to Rails internals wiping out the :include option. I've fixed ActiveRecord::Associations::HasManyAssociation#count so the test passes[1], but will still need to test if it doesn't mess up something else.

[1] There's a bug in the above tests, after the point where it fails: entries is not assigned to.