<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -34,8 +34,13 @@ module WillPaginate
       ActiveRecord::Base.class_eval { include Finder }
 
       # support pagination on associations
-      [ ActiveRecord::Associations::AssociationCollection,
-          ActiveRecord::Associations::HasManyThroughAssociation ].each do |klass|
+      a = ActiveRecord::Associations
+      returning([ a::AssociationCollection ]) { |classes|
+        # detect http://dev.rubyonrails.org/changeset/9230
+        unless a::HasManyThroughAssociation.superclass == a::HasManyAssociation
+          classes &lt;&lt; a::HasManyThroughAssociation
+        end
+      }.each do |klass|
         klass.class_eval do
           include Finder::ClassMethods
           alias_method_chain :method_missing, :paginate</diff>
      <filename>lib/will_paginate.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>1694bb814831a775beb0624a1d2947a90700046d</id>
    </parent>
  </parents>
  <author>
    <name>Mislav Marohni&#263;</name>
    <email>mislav.marohnic@gmail.com</email>
  </author>
  <url>http://github.com/mislav/will_paginate/commit/b00a298c02df8ab68e18bc107e41ce35533e1af1</url>
  <id>b00a298c02df8ab68e18bc107e41ce35533e1af1</id>
  <committed-date>2008-04-06T06:18:39-07:00</committed-date>
  <authored-date>2008-04-06T06:18:39-07:00</authored-date>
  <message>fix will_paginate for yet another Rails edge change (r9230)</message>
  <tree>40d35050d2d0be7c9205f119b5d819c4fdb39141</tree>
  <committer>
    <name>Mislav Marohni&#263;</name>
    <email>mislav.marohnic@gmail.com</email>
  </committer>
</commit>
