Index: branches/RC/core/units/general/helpers/search_helper.php =================================================================== diff -u -N -r9639 -r9643 --- branches/RC/core/units/general/helpers/search_helper.php (.../search_helper.php) (revision 9639) +++ branches/RC/core/units/general/helpers/search_helper.php (.../search_helper.php) (revision 9643) @@ -521,15 +521,15 @@ { $includes_or_filter =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_OR); $excepts_and_filter =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_AND); - + $includes_or_filter_h =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_OR); $excepts_and_filter_h =& $this->Application->makeClass('kMultipleFilter', FLT_TYPE_AND); - + if ($types) { $types = explode(',', $types); foreach ($types as $type) { $type = trim($type); - + if (isset($type_clauses[$type])) { if ($type_clauses[$type]['having_filter']) { $includes_or_filter_h->addFilter('filter_'.$type, $type_clauses[$type]['include']); @@ -539,12 +539,12 @@ } } } - + if ($except_types) { $except_types = explode(',', $except_types); foreach ($except_types as $type) { $type = trim($type); - + if (isset($type_clauses[$type])) { if ($type_clauses[$type]['having_filter']) { $excepts_and_filter_h->addFilter('filter_'.$type, $type_clauses[$type]['except']); @@ -554,12 +554,12 @@ } } } - + $object =& $event->getObject(); - + $object->addFilter('includes_filter', $includes_or_filter); $object->addFilter('excepts_filter', $excepts_and_filter); - + $object->addFilter('includes_filter_h', $includes_or_filter_h, HAVING_FILTER); $object->addFilter('excepts_filter_h', $excepts_and_filter_h, HAVING_FILTER); }