lib/active_scaffold/finder.rb in active_scaffold-3.2.19 vs lib/active_scaffold/finder.rb in active_scaffold-3.2.20

@@ -355,11 +355,11 @@
         :joins => joins_for_collection).calculate(column.calculate, column.name)
     end
     
     def append_to_query(query, options)
       options.assert_valid_keys :where, :select, :group, :reorder, :limit, :offset, :joins, :includes, :lock, :readonly, :from, :conditions
-      query = apply_conditions(query, *options.delete(:conditions)) if options[:conditions]
-      options.reject{|k, v| v.blank?}.inject(query) do |query, (k, v)|
+      query = apply_conditions(query, *options[:conditions]) if options[:conditions]
+      options.reject{|k, v| k == :conditions || v.blank?}.inject(query) do |query, (k, v)|
         query.send((k.to_sym), v) 
       end
     end
 
     def joins_for_finder