Index: branches/5.2.x/core/kernel/db/db_tag_processor.php =================================================================== diff -u -N -r15042 -r15137 --- branches/5.2.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 15042) +++ branches/5.2.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 15137) @@ -1,6 +1,6 @@ Application->getUnitOption($this->Prefix,'Grids'); $grid_config = $grids[$params['grid']]['Fields']; - $picker_helper =& $this->Application->RecallObject('ColumnPickerHelper'); + $picker_helper = $this->Application->recallObject('ColumnPickerHelper'); /* @var $picker_helper kColumnPickerHelper */ $picker_helper->ApplyPicker($this->getPrefixSpecial(), $grid_config, $params['grid']); @@ -264,7 +264,7 @@ function PickerCRC($params) { /* @var $picker_helper kColumnPickerHelper */ - $picker_helper =& $this->Application->RecallObject('ColumnPickerHelper'); + $picker_helper = $this->Application->recallObject('ColumnPickerHelper'); $picker_helper->SetGridName($params['grid']); $data = $picker_helper->LoadColumns($this->getPrefixSpecial()); return $data['crc']; @@ -273,7 +273,7 @@ function FreezerPosition($params) { /* @var $picker_helper kColumnPickerHelper */ - $picker_helper =& $this->Application->RecallObject('ColumnPickerHelper'); + $picker_helper = $this->Application->recallObject('ColumnPickerHelper'); $picker_helper->SetGridName($params['grid']); $data = $picker_helper->LoadColumns($this->getPrefixSpecial()); $freezer_pos = array_search('__FREEZER__', $data['order']); @@ -378,7 +378,7 @@ $prefix_special = rtrim($this->Prefix . '.' . $special, '.'); $params['skip_counting'] = true; - $list =& $this->Application->recallObject($prefix_special, $this->Prefix . '_List', $params); + $list = $this->Application->recallObject($prefix_special, $this->Prefix . '_List', $params); /* @var $list kDBList */ if ( !array_key_exists('skip_quering', $params) || !$params['skip_quering'] ) { @@ -551,7 +551,7 @@ if ( $this->Special && $this->Application->hasObject($this->Prefix) ) { // object, produced by "kDBList::linkToParent" method, that otherwise would keep it's id - $item =& $this->Application->recallObject($this->Prefix); + $item = $this->Application->recallObject($this->Prefix); /* @var $item kDBBase */ if ( $item instanceof kDBItem ) { @@ -611,7 +611,7 @@ $object =& $this->getObject($params); /* @var $object kDBItem */ - $list_helper =& $this->Application->recallObject('ListHelper'); + $list_helper = $this->Application->recallObject('ListHelper'); /* @var $list_helper ListHelper */ $select_clause = $this->Application->getUnitOption($object->Prefix, 'NavigationSelectClause', null); @@ -632,7 +632,7 @@ $object =& $this->getObject($params); /* @var $object kDBItem */ - $list_helper =& $this->Application->recallObject('ListHelper'); + $list_helper = $this->Application->recallObject('ListHelper'); /* @var $list_helper ListHelper */ $select_clause = $this->Application->getUnitOption($object->Prefix, 'NavigationSelectClause', null); @@ -734,7 +734,7 @@ list ($prefix, ) = explode('.', $prefix_special); if (!array_key_exists($prefix, $default_per_page)) { - $list_helper =& $this->Application->recallObject('ListHelper'); + $list_helper = $this->Application->recallObject('ListHelper'); /* @var $list_helper ListHelper */ $default_per_page[$prefix] = $list_helper->getDefaultPerPage($prefix); @@ -823,7 +823,7 @@ */ function ConvertCurrency($value, $iso) { - $converter =& $this->Application->recallObject('CurrencyRates'); + $converter = $this->Application->recallObject('CurrencyRates'); /* @var $converter CurrencyRates */ return $converter->Convert($value, 'PRIMARY', $iso); @@ -849,7 +849,7 @@ if ( $decimal_tag ) { if ( $decimal_separator === false ) { - $language =& $this->Application->recallObject('lang.current'); + $language = $this->Application->recallObject('lang.current'); /* @var $language LanguagesItem */ $decimal_separator = $language->GetDBField('DecimalPoint'); @@ -1019,7 +1019,7 @@ $format = array_key_exists('format', $params) ? $params['format'] : false; if (preg_match('/_regional_(.*)/', $format, $regs)) { - $language =& $this->Application->recallObject('lang.current'); + $language = $this->Application->recallObject('lang.current'); /* @var $language kDBItem */ $format = $language->GetDBField($regs[1]); @@ -1059,7 +1059,7 @@ $dst_field = $this->SelectParam($params, 'name,field'); list($prefix_special, $src_field) = explode(':', $params['src']); - $src_object =& $this->Application->recallObject($prefix_special); + $src_object = $this->Application->recallObject($prefix_special); /* @var $src_object kDBItem */ $object->SetDBField($dst_field, $src_object->GetDBField($src_field)); @@ -1145,7 +1145,7 @@ $formatter_class = $object->GetFieldOption($field, 'formatter'); if ( $formatter_class == 'kMultiLanguage' ) { - $formatter =& $this->Application->recallObject($formatter_class); + $formatter = $this->Application->recallObject($formatter_class); /* @var $formatter kMultiLanguage */ $field = $formatter->LangFieldName($field); @@ -1281,7 +1281,7 @@ $formatter_class = array_key_exists('formatter', $options) ? $options['formatter'] : false; if ( $formatter_class ) { - $formatter =& $this->Application->recallObject($formatter_class); + $formatter = $this->Application->recallObject($formatter_class); /* @var $formatter kFormatter */ $human_format = array_key_exists('human', $params) ? $params['human'] : false; @@ -1539,7 +1539,7 @@ $formatter_class = $object->GetFieldOption($field, 'formatter'); if ($formatter_class == 'kMultiLanguage') { - $formatter =& $this->Application->recallObject($formatter_class); + $formatter = $this->Application->recallObject($formatter_class); /* @var $formatter kMultiLanguage */ $force_primary = $object->GetFieldOption($field, 'force_primary'); @@ -1664,7 +1664,7 @@ { $list =& $this->GetList($params); - $list_helper =& $this->Application->recallObject('ListHelper'); + $list_helper = $this->Application->recallObject('ListHelper'); /* @var $list_helper ListHelper */ return $list_helper->hasUserSorting($list); @@ -1954,7 +1954,7 @@ } $tag_params = array_merge($params, $tag_params); - $objects[ $prefix_data['prefix_special'] ] =& $this->Application->recallObject($prefix_data['prefix_special'], $prefix_data['prefix'], $tag_params); + $objects[ $prefix_data['prefix_special'] ] = $this->Application->recallObject($prefix_data['prefix_special'], $prefix_data['prefix'], $tag_params); $object_status[ $prefix_data['prefix_special'] ] = $objects[ $prefix_data['prefix_special'] ]->IsNewItem() ? 'new' : 'edit'; // a. set object's status field (adding item/editing item) for each object in title @@ -1975,7 +1975,7 @@ // replace to section title $section = array_key_exists('section', $params) ? $params['section'] : false; if ($section) { - $sections_helper =& $this->Application->recallObject('SectionsHelper'); + $sections_helper = $this->Application->recallObject('SectionsHelper'); /* @var $sections_helper kSectionsHelper */ $section_data =& $sections_helper->getSectionData($section); @@ -2092,7 +2092,7 @@ $field = $params['field']; - $helper =& $this->Application->recallObject('InpCustomFieldsHelper'); + $helper = $this->Application->recallObject('InpCustomFieldsHelper'); /* @var $helper InpCustomFieldsHelper */ $element_type = $object->GetDBField($params['element_type_field']); @@ -2290,7 +2290,7 @@ $formatter_class = $object->GetFieldOption($field, 'formatter'); if ( $formatter_class ) { - $formatter =& $this->Application->recallObject($formatter_class); + $formatter = $this->Application->recallObject($formatter_class); /* @var $formatter kFormatter */ $ret = $formatter->Format($ret, $field, $object); @@ -2351,7 +2351,7 @@ $this->Application->RemoveVar($error_var_name); } - $object =& $this->Application->recallObject($this->Prefix . '.' . $this->Special . '-item', null, Array ('skip_autoload' => true)); + $object = $this->Application->recallObject($this->Prefix . '.' . $this->Special . '-item', null, Array ('skip_autoload' => true)); /* @var $object kDBItem */ $object->SetError($field, $pseudo); @@ -2367,7 +2367,7 @@ */ function &getObject($params = Array()) { - $object =& $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params); + $object = $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params); /* @var $object kDBItem */ if ( isset($params['requery']) && $params['requery'] ) { @@ -2424,7 +2424,7 @@ */ function ExportStatus($params) { - $export_object =& $this->Application->recallObject('CatItemExportHelper'); + $export_object = $this->Application->recallObject('CatItemExportHelper'); /* @var $export_object kCatDBItemExportHelper */ $event = new kEvent($this->getPrefixSpecial().':OnDummy'); @@ -2612,7 +2612,7 @@ ); if ( file_exists(SYSTEM_PRESET_PATH . DIRECTORY_SEPARATOR . 'inp_ckconfig.js') ) { - $file_helper =& $this->Application->recallObject('FileHelper'); + $file_helper = $this->Application->recallObject('FileHelper'); /* @var $file_helper FileHelper */ $config_js = $file_helper->pathToUrl(SYSTEM_PRESET_PATH . DIRECTORY_SEPARATOR . 'inp_ckconfig.js'); @@ -2885,7 +2885,7 @@ */ function RangeFiltersUsed($params) { - $search_helper =& $this->Application->recallObject('SearchHelper'); + $search_helper = $this->Application->recallObject('SearchHelper'); /* @var $search_helper kSearchHelper */ return $search_helper->rangeFiltersUsed($this->getPrefixSpecial(), $params['grid']);