correcting my last commit

git-svn-id: http://activescaffold.googlecode.com/svn/trunk@686 561dde7e-7729-0410-be8e-ef83869d6c7d
activescaffold · Nov 21, 2007 · 9f72972 · 9f72972
1 parent 1b64c53
commit 9f72972
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/finder.rb b/lib/finder.rb
@@ -110,7 +110,7 @@ def find_page(options = {})
     # TODO: this should reside on the model, not the controller
     def merge_conditions(*conditions)
       c = conditions.find_all {|c| not c.nil? and not c.empty? }
-      c.empty? ? nil : c.collect{|c| active_record_config.model.send(:sanitize_sql, c)}.join(' AND ')
+      c.empty? ? nil : c.collect{|c| active_scaffold_config.model.send(:sanitize_sql, c)}.join(' AND ')
     end
 
     # accepts a DataStructure::Sorting object and builds an order-by clause