@@ -1499,6 +1499,19 @@ module ActiveRecord #:nodoc: "(#{segments.join(') AND (')})" unless segments.empty? end + # XXX: Merges conditions so that the result is a valid +condition+ + def merge_conditions_with_or(*conditions) + segments = [] + + conditions.each do |condition| + unless condition.blank? + sql = sanitize_sql(condition) + segments << sql unless sql.blank? + end + end + "(#{segments.join(') OR (')})" unless segments.empty? + end + private def find_initial(options) options.update(:limit => 1) vendor/rails/activerecord/lib/active_record/base.rb b8d4cb3ef90345ece055cad43175eae0ffd12e8d Lennart Koopmann lennart@linux.jimdo.office http://github.com/lennartkoopmann/Graylog/commit/29f3acc0d021e0fa0305f567f06fa05e3a56bcb0 29f3acc0d021e0fa0305f567f06fa05e3a56bcb0 2009-10-28T05:05:02-07:00 2009-10-28T05:04:36-07:00 This uber-dirty hack was lost in the last Rails freeze. Blacklist view is working again ec12f6929bae744dba38df76057b7469609371b9 Lennart Koopmann lennart@linux.jimdo.office