Index: branches/5.2.x/core/units/languages/languages_event_handler.php =================================================================== diff -u -N -r14637 -r14675 --- branches/5.2.x/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 14637) +++ branches/5.2.x/core/units/languages/languages_event_handler.php (.../languages_event_handler.php) (revision 14675) @@ -1,6 +1,6 @@ getObject(); /* @var $object kDBList */ - + if (!$this->Application->isAdminUser) { $object->addFilter('active_filter', '%1$s.Status = '.STATUS_ACTIVE); } Index: branches/5.2.x/core/units/forms/forms/forms_eh.php =================================================================== diff -u -N -r14596 -r14675 --- branches/5.2.x/core/units/forms/forms/forms_eh.php (.../forms_eh.php) (revision 14596) +++ branches/5.2.x/core/units/forms/forms/forms_eh.php (.../forms_eh.php) (revision 14675) @@ -1,6 +1,6 @@ Application->InitParser(); - + try { $this->Application->Parser->CompileRaw($object->GetField($field), 'email_template'); } Index: branches/5.2.x/core/units/visits/visits_event_handler.php =================================================================== diff -u -N -r14628 -r14675 --- branches/5.2.x/core/units/visits/visits_event_handler.php (.../visits_event_handler.php) (revision 14628) +++ branches/5.2.x/core/units/visits/visits_event_handler.php (.../visits_event_handler.php) (revision 14675) @@ -1,6 +1,6 @@ PreparePostProcess($params); $f_name = $this->Elements[$params['name']]; + /* @var $f_name Closure */ + $ret = $f_name($this, $params); $ret = $m_processor->PostProcess($ret, $flag_values); $block_params = $this->Params; // input parameters, but modified inside rendered block Index: branches/5.2.x/core/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r14653 -r14675 --- branches/5.2.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 14653) +++ branches/5.2.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 14675) @@ -1,6 +1,6 @@ getObject($params); + /* @var $object kDBItem */ - if (isset($params['today']) && $params['today']) { + if ( isset($params['today']) && $params['today'] ) { $sql = 'SELECT COUNT(*) - FROM '.$object->TableName.' - WHERE (ParentPath LIKE "'.$object->GetDBField('ParentPath').'%") AND (CreatedOn > '.(adodb_mktime() - 86400).')'; + FROM ' . $object->TableName . ' + WHERE (ParentPath LIKE "' . $object->GetDBField('ParentPath') . '%") AND (CreatedOn > ' . (adodb_mktime() - 86400) . ')'; return $this->Conn->GetOne($sql) - 1; } @@ -46,6 +47,8 @@ function IsNew($params) { $object =& $this->getObject($params); + /* @var $object kDBItem */ + return $object->GetDBField('IsNew') ? 1 : 0; } @@ -63,6 +66,7 @@ function IsEditorsPick($params) { $object =& $this->getObject($params); + /* @var $object kDBItem */ return $object->GetDBField('EditorsPick') == 1; } @@ -1037,6 +1041,8 @@ { // show category cachednavbar of $object =& $this->getObject($params); + /* @var $object kDBItem */ + $category_id = isset($params['cat_id']) ? $params['cat_id'] : $object->GetDBField('CategoryId'); $cache_key = 'category_paths[%CIDSerial:' . $category_id . '%][%PhrasesSerial%][Adm:' . (int)$this->Application->isAdmin . ']'; @@ -1649,6 +1655,7 @@ function PageBrowseLink($params) { $object =& $this->getObject($params); + /* @var $object kDBItem */ $themes_helper =& $this->Application->recallObject('ThemesHelper'); /* @var $themes_helper kThemesHelper */ @@ -1677,6 +1684,7 @@ function DirectLink($params) { $object =& $this->getObject($params); + /* @var $object kDBItem */ $themes_helper =& $this->Application->recallObject('ThemesHelper'); /* @var $themes_helper kThemesHelper */ @@ -1705,6 +1713,8 @@ function ContentPageLink($params) { $object =& $this->getObject($params); + /* @var $object kDBItem */ + $params['t'] = $object->GetDBField('NamedParentPath'); $params['m_cat_id'] = 0; @@ -1948,6 +1958,7 @@ function RelevanceIndicator($params) { $object =& $this->getObject($params); + /* @var $object kDBItem */ $search_results_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search'; $sql = 'SELECT Relevance Index: branches/5.2.x/core/units/permissions/permissions_event_handler.php =================================================================== diff -u -N -r14628 -r14675 --- branches/5.2.x/core/units/permissions/permissions_event_handler.php (.../permissions_event_handler.php) (revision 14628) +++ branches/5.2.x/core/units/permissions/permissions_event_handler.php (.../permissions_event_handler.php) (revision 14675) @@ -1,6 +1,6 @@ Application->recallObject('c'); /* @var $temp_object CategoriesItem */ - + if ( $temp_object->isLoaded() ) { // category with id = 0 found in temp table $event->status = kEvent::erFAIL; Index: branches/5.2.x/core/units/selectors/selectors_event_handler.php =================================================================== diff -u -N -r14640 -r14675 --- branches/5.2.x/core/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 14640) +++ branches/5.2.x/core/units/selectors/selectors_event_handler.php (.../selectors_event_handler.php) (revision 14675) @@ -1,6 +1,6 @@ SerializeSelectorData($event); } @@ -199,7 +199,7 @@ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); if ( $items_info ) { list($id, $field_values) = each($items_info); - + if ( $id == 0 ) { $parent_id = getArrayValue($field_values, 'ParentId'); if ( $parent_id ) { Index: branches/5.2.x/core/units/favorites/favorites_eh.php =================================================================== diff -u -N -r14628 -r14675 --- branches/5.2.x/core/units/favorites/favorites_eh.php (.../favorites_eh.php) (revision 14628) +++ branches/5.2.x/core/units/favorites/favorites_eh.php (.../favorites_eh.php) (revision 14675) @@ -1,6 +1,6 @@