Rails 2.2 fix: stop using extract_attribute_names_from_match inerna…

…l AR method, it no longer exists
min · Oct 26, 2008 · 48fc49c · 48fc49c
1 parent f161d99
commit 48fc49c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/will_paginate/finder.rb b/lib/will_paginate/finder.rb
@@ -222,9 +222,9 @@ def wp_count(options, args, finder)
                   # scope_out adds a 'with_finder' method which acts like with_scope, if it's present
                   # then execute the count with the scoping provided by the with_finder
                   send(scoper, &counter)
-                elsif match = /^find_(all_by|by)_([_a-zA-Z]\w*)$/.match(finder)
+                elsif finder =~ /^find_(all_by|by)_([_a-zA-Z]\w*)$/
                   # extract conditions from calls like "paginate_by_foo_and_bar"
-                  attribute_names = extract_attribute_names_from_match(match)
+                  attribute_names = $2.split('_and_')
                   conditions = construct_attributes_from_arguments(attribute_names, args)
                   with_scope(:find => { :conditions => conditions }, &counter)
                 else