Index: branches/5.2.x/core/units/helpers/search_helper.php =================================================================== diff -u -N -r16374 -r16513 --- branches/5.2.x/core/units/helpers/search_helper.php (.../search_helper.php) (revision 16374) +++ branches/5.2.x/core/units/helpers/search_helper.php (.../search_helper.php) (revision 16513) @@ -1,6 +1,6 @@ getObject(); - /* @var $object kDBItem */ // process search keyword $search_keyword = $this->Application->GetVar($event->getPrefixSpecial(true) . '_search_keyword'); @@ -251,8 +251,8 @@ $search_filter = Array(); + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ foreach ($search_fields as $search_field) { $custom_search = isset($custom_filter[$search_field]); @@ -691,8 +691,8 @@ } } + /** @var kFormatter $formatter */ $formatter = $this->Application->recallObject($options['formatter']); - /* @var $formatter kFormatter */ $value_ts = $formatter->Parse($value[$type], $search_field, $object); @@ -718,8 +718,8 @@ return $field_options['input_time_format']; } + /** @var LanguagesItem $lang_current */ $lang_current = $this->Application->recallObject('lang.current'); - /* @var $lang_current LanguagesItem */ return $lang_current->GetDBField('InputTimeFormat'); } @@ -748,17 +748,17 @@ */ function SetComplexFilter($event, &$type_clauses, $types, $except_types) { + /** @var kMultipleFilter $includes_or_filter */ $includes_or_filter = $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_OR)); - /* @var $includes_or_filter kMultipleFilter */ + /** @var kMultipleFilter $excepts_and_filter */ $excepts_and_filter = $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_AND)); - /* @var $excepts_and_filter kMultipleFilter */ + /** @var kMultipleFilter $includes_or_filter_h */ $includes_or_filter_h = $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_OR)); - /* @var $includes_or_filter_h kMultipleFilter */ + /** @var kMultipleFilter $excepts_and_filter_h */ $excepts_and_filter_h = $this->Application->makeClass('kMultipleFilter', Array (kDBList::FLT_TYPE_AND)); - /* @var $excepts_and_filter_h kMultipleFilter */ if ( $types ) { $types = explode(',', $types); @@ -793,8 +793,8 @@ } } + /** @var kDBList $object */ $object = $event->getObject(); - /* @var $object kDBList */ $object->addFilter('includes_filter', $includes_or_filter); $object->addFilter('excepts_filter', $excepts_and_filter);