Index: kernel/db/cat_tag_processor.php =================================================================== --- kernel/db/cat_tag_processor.php (revision 15137) +++ kernel/db/cat_tag_processor.php (working copy) @@ -52,7 +52,7 @@ return $icons['default']; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ $value = $object->GetDBField($status_fields[0]); // sets base status icon @@ -98,7 +98,7 @@ $item_id = $this->Application->GetVar($this->Prefix . '_id'); } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $params['m_cat_page'] = 1; @@ -148,7 +148,7 @@ } else { // path for category item category in front-end - $object =& $this->getObject($params); + $object = $this->getObject($params); $params['cat_id'] = $object->GetDBField('CategoryId'); } @@ -253,7 +253,7 @@ function CategoryName($params) { // show category cachednavbar of - $object =& $this->getObject($params); + $object = $this->getObject($params); $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 . ']'; @@ -291,7 +291,7 @@ $owner_field = 'CreatedById'; } - $object =& $this->getObject($params); + $object = $this->getObject($params); $perm_value = $this->PermHelper->ModifyCheckPermission($object->GetDBField($owner_field), $object->GetDBField('CategoryId'), $this->Prefix); return $display_original && ($perm_value == 1) && $this->Application->GetVar($this->Prefix.'.original_id'); @@ -309,7 +309,7 @@ /* @var $perm_helper kPermissionsHelper */ $params['raise_warnings'] = 0; - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kCatDBItem */ // 1. category restriction @@ -354,7 +354,7 @@ */ function HasAdditionalImages($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $cache_key = $object->Prefix . '_additional_images[%' . $this->Application->incrementCacheSerial($object->Prefix, $object->GetID(), false) . '%]'; @@ -381,7 +381,7 @@ */ function IsPending($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $pending_status = Array (STATUS_PENDING, STATUS_PENDING_EDITING); return in_array($object->GetDBField('Status'), $pending_status); @@ -391,7 +391,7 @@ { static $favorite_status = Array (); - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ if (!isset($favorite_status[$this->Special])) { @@ -415,7 +415,7 @@ */ function IsEditorsPick($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); return $object->GetDBField('EditorsPick') == 1; } @@ -520,7 +520,7 @@ */ function VotesIndicator($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $rating_helper = $this->Application->recallObject('RatingHelper'); @@ -533,7 +533,7 @@ function RelevanceIndicator($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $search_results_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search'; $sql = 'SELECT Relevance @@ -737,7 +737,7 @@ function PrintMoreCategories($params) { - $object =& $this->getObject(); + $object = $this->getObject($params); /* @var $object kDBItem */ $category_ids = $this->Field($params); @@ -793,7 +793,7 @@ */ function RegisterHit($params) { - $object =& $this->getObject(); + $object = $this->getObject($params); /* @var $object kCatDBItem */ if ($object->isLoaded()) { @@ -809,7 +809,7 @@ */ function ProfileLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $owner_field = array_key_exists('owner_field', $params) ? $params['owner_field'] : 'CreatedById'; $params['user_id'] = $object->GetDBField($owner_field); unset($params['owner_field']); @@ -839,7 +839,7 @@ */ function ItemEditLink($params) { - $object =& $this->getObject(); + $object = $this->getObject($params); /* @var $object kDBList */ $edit_template = $this->Application->getUnitOption($this->Prefix, 'AdminTemplatePath') . '/' . $this->Application->getUnitOption($this->Prefix, 'AdminTemplatePrefix') . 'edit'; @@ -880,7 +880,7 @@ $field = $this->SelectParam($params, 'name,field'); - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ foreach ($languages as $language_id) { @@ -905,7 +905,7 @@ $categories = true; } else { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $perm_helper = $this->Application->recallObject('PermissionsHelper'); Index: kernel/db/db_tag_processor.php =================================================================== --- kernel/db/db_tag_processor.php (revision 15137) +++ kernel/db/db_tag_processor.php (working copy) @@ -24,7 +24,7 @@ */ function IsNewMode($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); return $object->GetID() <= 0; } @@ -608,7 +608,7 @@ */ protected function PreviousResource($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $list_helper = $this->Application->recallObject('ListHelper'); @@ -629,7 +629,7 @@ */ protected function NextResource($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $list_helper = $this->Application->recallObject('ListHelper'); @@ -880,7 +880,7 @@ $params['no_special'] = 'no_special'; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ if (array_key_exists('db', $params) && $params['db']) { @@ -984,7 +984,7 @@ $field = $this->SelectParam($params, 'name,field'); if ($field) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $timestamp = $object->GetDBField($field); @@ -1053,7 +1053,7 @@ { // - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $dst_field = $this->SelectParam($params, 'name,field'); @@ -1081,7 +1081,7 @@ function Error($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $this->SelectParam($params, 'name,field'); @@ -1092,7 +1092,7 @@ function HasError($params) { if ($params['field'] == 'any') { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $skip_fields = array_key_exists('except', $params) ? $params['except'] : false; @@ -1138,7 +1138,7 @@ function IsRequired($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $params['field']; @@ -1156,7 +1156,7 @@ function FieldOption($params) { - $object =& $this->getObject($params);; + $object = $this->getObject($params);; $options = $object->GetFieldOptions($params['field']); $ret = isset($options[$params['option']]) ? $options[$params['option']] : ''; if (isset($params['as_label']) && $params['as_label']) $ret = $this->Application->ReplaceLanguageTags($ret); @@ -1172,7 +1172,7 @@ */ protected function PredefinedOptions($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ $field = $params['field']; @@ -1272,7 +1272,7 @@ $field = $this->SelectParam($params, 'name,field'); if ( !isset($object) ) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ } @@ -1532,7 +1532,7 @@ */ function prepareInputName($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $this->SelectParam($params, 'name,field'); @@ -1599,7 +1599,7 @@ } if (isset($params['value'])) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $field_modifiers[$field][$params['type']] = $params['value']; $object->ApplyFieldModifiers($field_modifiers); } @@ -1745,13 +1745,13 @@ function SaveEvent($params) { // SaveEvent is set during OnItemBuild, but we may need it before any other tag calls OnItemBuild - $object =& $this->getObject($params); + $object = $this->getObject($params); return $this->Application->GetVar($this->getPrefixSpecial().'_SaveEvent'); } function NextId($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $wid = $this->Application->GetTopmostWid($this->Prefix); $session_name = rtrim($this->getPrefixSpecial().'_selected_ids_'.$wid, '_'); @@ -1768,7 +1768,7 @@ function PrevId($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $wid = $this->Application->GetTopmostWid($this->Prefix); $session_name = rtrim($this->getPrefixSpecial().'_selected_ids_'.$wid, '_'); @@ -1807,7 +1807,7 @@ */ function FieldEquals($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return $object->GetDBField( $this->SelectParam($params, 'name,field') ) == $params['value']; @@ -1882,7 +1882,7 @@ return $icons['default']; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ $icon = ''; @@ -2087,7 +2087,7 @@ */ function ConfigFormElement($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $params['field']; @@ -2155,7 +2155,7 @@ function CustomFieldLabel($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $field = $this->SelectParam($params, 'name,field'); @@ -2365,13 +2365,13 @@ * @access public * @return kDBItem|kDBList */ - function &getObject($params = Array()) + function getObject($params = Array()) { $object = $this->Application->recallObject($this->getPrefixSpecial(), $this->Prefix, $params); /* @var $object kDBItem */ if ( isset($params['requery']) && $params['requery'] ) { - $this->Application->HandleEvent($q_event, $this->getPrefixSpecial() . ':LoadItem', $params); + $this->Application->HandleEvent(new kEvent($this->getPrefixSpecial() . ':LoadItem', $params)); } return $object; @@ -2385,7 +2385,7 @@ */ function PropertyEquals($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $property_name = $this->SelectParam($params, 'name,var,property'); return $object->$property_name == $params['value']; } @@ -2404,7 +2404,7 @@ $ret = ''; if ($selected_ids) { $selected_ids = explode(',', $selected_ids); - $object =& $this->getObject( kUtil::array_merge_recursive($params, Array('skip_autoload' => true)) ); + $object = $this->getObject( kUtil::array_merge_recursive($params, Array('skip_autoload' => true)) ); $params['name'] = $params['render_as']; foreach ($selected_ids as $id) { $object->Load($id); @@ -2651,7 +2651,7 @@ function IsNewItem($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); return $object->IsNewItem(); } @@ -2664,7 +2664,7 @@ */ protected function ItemLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ if ( !isset($params['pass']) ) { @@ -2691,7 +2691,7 @@ function PrintSerializedFields($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $this->SelectParam($params, 'field'); @@ -2832,7 +2832,7 @@ $logo_filename = isset($params['LogoFilename']) ? $params['LogoFilename'] : false; $logo_h_margin = isset($params['LogoHMargin']) ? $params['LogoHMargin'] : false; $logo_v_margin = isset($params['LogoVMargin']) ? $params['LogoVMargin'] : false; - $object =& $this->getObject($params); + $object = $this->getObject($params); $field = $this->SelectParam($params, 'name,field'); return $object->GetField($field, 'resize:'.$max_width.'x'.$max_height.';wm:'.$logo_filename.'|'.$logo_h_margin.'|'.$logo_v_margin); @@ -2975,7 +2975,7 @@ */ function Selected($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $this->SelectParam($params, 'name,field'); @@ -2998,7 +2998,7 @@ */ protected function OptionValue($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $value = $params['value']; @@ -3030,7 +3030,7 @@ $prefix = $this->getPrefixSpecial(); if ( $this->Application->hasObject( $this->getPrefixSpecial() ) ) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ if ( $object->getFormName() != $form_name ) { @@ -3046,7 +3046,7 @@ return ''; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return $object->getFormName(); @@ -3063,7 +3063,7 @@ { $params['requery'] = 1; - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return ''; Index: units/categories/categories_tag_processor.php =================================================================== --- units/categories/categories_tag_processor.php (revision 15137) +++ units/categories/categories_tag_processor.php (working copy) @@ -18,7 +18,7 @@ function SubCatCount($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ if ( isset($params['today']) && $params['today'] ) { @@ -48,7 +48,7 @@ function IsNew($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return $object->GetDBField('IsNew') ? 1 : 0; @@ -67,7 +67,7 @@ */ function IsEditorsPick($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return $object->GetDBField('EditorsPick') == 1; @@ -90,7 +90,7 @@ return array_key_exists($icon_name, $icons) ? $icons[$icon_name] : ''; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ if ($object->GetDBField('ThemeId') > 0) { @@ -123,7 +123,7 @@ function ItemCount($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $ci_table = $this->Application->getUnitOption('ci', 'TableName'); @@ -195,7 +195,7 @@ */ function FieldCategoryPath($params) { - $object =& $this->getObject(); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $this->SelectParam($params, 'name,field'); @@ -442,7 +442,7 @@ function IsCurrent($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); if ($object->GetID() == $this->Application->GetVar('m_cat_id')) { return true; } @@ -625,7 +625,7 @@ */ function IsRootCategory($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object CategoriesItem */ return $object->IsRoot(); @@ -732,7 +732,7 @@ $cat_id = array_key_exists('cat_id', $params) && $params['cat_id'] ? $params['cat_id'] : false; if ( $cat_id === false ) { // category not supplied -> get current from PrintList - $category =& $this->getObject($params); + $category = $this->getObject($params); } else { if ( "$cat_id" == 'Root' ) { @@ -764,7 +764,7 @@ /* @var $perm_helper kPermissionsHelper */ $params['raise_warnings'] = 0; - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $params['cat_id'] = $object->isLoaded() ? $object->GetDBField('ParentPath') : $this->Application->GetVar('m_cat_id'); @@ -846,7 +846,7 @@ function CategoryItemCount($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ $params['cat_id'] = $object->GetID(); @@ -876,7 +876,7 @@ */ function IsCategorySymLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ $sym_category_id = $object->GetDBField('SymLinkCategoryId'); @@ -904,7 +904,7 @@ */ function GetModulePrefix($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $parent_path = explode('|', substr($object->GetDBField('ParentPath'), 1, -1)); @@ -1057,7 +1057,7 @@ function CategoryName($params) { // show category cachednavbar of - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $category_id = isset($params['cat_id']) ? $params['cat_id'] : $object->GetDBField('CategoryId'); @@ -1812,7 +1812,7 @@ */ function PageBrowseLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $themes_helper = $this->Application->recallObject('ThemesHelper'); @@ -1841,7 +1841,7 @@ function DirectLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $themes_helper = $this->Application->recallObject('ThemesHelper'); @@ -1870,7 +1870,7 @@ */ function ContentPageLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $params['t'] = $object->GetDBField('NamedParentPath'); @@ -1887,7 +1887,7 @@ */ function SearchDescription($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $desc = $object->GetField('MetaDescription'); if (!$desc) { $sql = 'SELECT * @@ -1915,7 +1915,7 @@ */ function EnterCatLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $url_params = Array ('pass' => 'm', 'm_cat_id' => $object->GetID()); return $this->Application->HREF($params['template'], '', $url_params); @@ -1930,7 +1930,7 @@ */ function PagePath($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $path = $object->GetField('CachedNavbar'); if ($path) { $items = explode('&|&', $path); @@ -2095,7 +2095,7 @@ */ function ItemEditLink($params) { - $object =& $this->getObject(); + $object = $this->getObject($params); /* @var $object kDBList */ $edit_template = $this->Application->getUnitOption($this->Prefix, 'AdminTemplatePath') . '/' . $this->Application->getUnitOption($this->Prefix, 'AdminTemplatePrefix') . 'edit'; @@ -2115,7 +2115,7 @@ function RelevanceIndicator($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $search_results_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search'; @@ -2148,7 +2148,7 @@ $categories = true; } else { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $perm_helper = $this->Application->recallObject('PermissionsHelper'); @@ -2170,7 +2170,7 @@ return true; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return !$object->GetDBField('Protected'); Index: units/category_items/category_items_tag_processor.php =================================================================== --- units/category_items/category_items_tag_processor.php (revision 15111) +++ units/category_items/category_items_tag_processor.php (working copy) @@ -20,7 +20,7 @@ { $field = $this->SelectParam($params, 'name,field'); - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ $root_phrase = $this->Application->Phrase(($this->Application->isAdmin ? 'la_' : 'lu_') . 'rootcategory_name'); @@ -36,11 +36,11 @@ return $ret; } - function GetMainID() + function GetMainID($params) { - $object =& $this->getObject(); + $object = $this->getObject($params); $table_info = $object->getLinkedInfo(); - + return $table_info['ParentId']; } } \ No newline at end of file Index: units/configuration/configuration_tag_processor.php =================================================================== --- units/configuration/configuration_tag_processor.php (revision 15128) +++ units/configuration/configuration_tag_processor.php (working copy) @@ -157,7 +157,7 @@ function IsRequired($params) { - $object =& $this->getObject($params);; + $object = $this->getObject($params);; /* @var $object kDBList */ $field_options = $object->GetDBField('Validation'); @@ -168,7 +168,7 @@ function Error($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ $field = $object->GetDBField($params['id_field']); Index: units/custom_fields/custom_fields_tag_processor.php =================================================================== --- units/custom_fields/custom_fields_tag_processor.php (revision 15137) +++ units/custom_fields/custom_fields_tag_processor.php (working copy) @@ -24,7 +24,7 @@ */ function GetMainField($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $append = isset($params['append']) && $params['append'] ? $params['append'] : ''; return 'cust_'.$object->GetDBField('FieldName').$append; } Index: units/email_events/email_event_tp.php =================================================================== --- units/email_events/email_event_tp.php (revision 15111) +++ units/email_events/email_event_tp.php (working copy) @@ -49,7 +49,7 @@ return true; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return $object->GetDBField($params['check_field']); @@ -74,7 +74,7 @@ */ function RemoveToRecipientType($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field_options = $object->GetFieldOptions('RecipientType'); @@ -89,7 +89,7 @@ */ function RestoreRecipientType($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field_options = $object->GetFieldOptions('RecipientType'); Index: units/email_queue/email_queue_tp.php =================================================================== --- units/email_queue/email_queue_tp.php (revision 15111) +++ units/email_queue/email_queue_tp.php (working copy) @@ -18,7 +18,7 @@ function PrintSerializedFields($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $field = $this->SelectParam($params, 'field'); $data = unserialize( $object->GetDBField($field) ); Index: units/files/file_tp.php =================================================================== --- units/files/file_tp.php (revision 15111) +++ units/files/file_tp.php (working copy) @@ -26,7 +26,7 @@ function FileIcon($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $last_dot = mb_strrpos($object->GetDBField('FilePath'), '.'); Index: units/filters/item_filter_tp.php =================================================================== --- units/filters/item_filter_tp.php (revision 15137) +++ units/filters/item_filter_tp.php (working copy) @@ -45,7 +45,7 @@ { static $cache = Array (); - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ // get item list to be filtered @@ -311,7 +311,7 @@ $range_count = $max_value / $this->Application->GetVar('range_step'); } else { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $range_count = $object->GetDBField('RangeCount'); Index: units/forms/form_fields/form_fields_tp.php =================================================================== --- units/forms/form_fields/form_fields_tp.php (revision 15137) +++ units/forms/form_fields/form_fields_tp.php (working copy) @@ -18,7 +18,7 @@ function CustomInputName($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $source_prefix = $this->Application->Parser->GetParam('SourcePrefix'); $source_tp = $this->Application->recallTagProcessor($source_prefix); @@ -29,7 +29,7 @@ function SubmissionTag($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $params['field'] = 'fld_'.$object->GetDBField('FormFieldId'); $source_prefix = $this->Application->Parser->GetParam('SourcePrefix'); Index: units/forms/form_submissions/form_submission_tp.php =================================================================== --- units/forms/form_submissions/form_submission_tp.php (revision 15137) +++ units/forms/form_submissions/form_submission_tp.php (working copy) @@ -42,7 +42,7 @@ */ function FormField($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $form_submission_helper = $this->Application->recallObject('FormSubmissionHelper'); Index: units/forms/forms/forms_tp.php =================================================================== --- units/forms/forms/forms_tp.php (revision 15111) +++ units/forms/forms/forms_tp.php (working copy) @@ -18,7 +18,7 @@ function CheckBox($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $value = $object->GetDBField($this->SelectParam($params, 'name,field')); @@ -26,7 +26,7 @@ if ( $value ) { return 'checked'; } - + if ( is_null($value) ) { return $params['default']; } Index: units/forms/submission_log/submission_log_tp.php =================================================================== --- units/forms/submission_log/submission_log_tp.php (revision 15137) +++ units/forms/submission_log/submission_log_tp.php (working copy) @@ -24,7 +24,7 @@ */ function IsNewUserReply($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $user_reply = $this->IsUserReply($params); @@ -40,7 +40,7 @@ */ function IsUserReply($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $reply_email = $this->Application->ConfigValue('SubmissionReplyFromEmail'); @@ -61,7 +61,7 @@ return false; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $draft = $this->Application->recallObject('draft', null, Array('skip_autoload' => true)); @@ -86,7 +86,7 @@ */ function IterateFiles($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $field = $this->SelectParam($params, 'name,field'); Index: units/images/image_tag_processor.php =================================================================== --- units/images/image_tag_processor.php (revision 15137) +++ units/images/image_tag_processor.php (working copy) @@ -72,7 +72,7 @@ function LargeImageExists($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); if ($object->GetDBField('SameImages') == null || $object->GetDBField('SameImages') == 1) { return false; } @@ -215,7 +215,7 @@ function ImageSrc($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $this->makeRelativePaths($object); @@ -291,7 +291,7 @@ function _getImageUrl($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $base_url = rtrim($this->Application->BaseURL(), '/'); @@ -441,7 +441,7 @@ return ''; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $params['img_path'] = $image_url; @@ -467,7 +467,7 @@ */ function ImageUrl($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); if ($object->GetDBField('SameImages') ? $object->GetDBField('LocalThumb') : $object->GetDBField('LocalImage') ) { $ret = $this->Application->Phrase(getArrayValue($params,'local_phrase')); } Index: units/languages/languages_tag_processor.php =================================================================== --- units/languages/languages_tag_processor.php (revision 15137) +++ units/languages/languages_tag_processor.php (working copy) @@ -32,7 +32,7 @@ $top_prefix = $this->Application->GetTopmostPrefix($this->Prefix); if( substr($this->Application->GetVar($top_prefix.'_mode'), 0, 1) == 't' && !$edit_direct ) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return $object->GetDBField('Charset'); @@ -74,13 +74,13 @@ function LanguageName($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); return $this->Application->Phrase($params['phrase_prefix'].$object->GetDBField('PackName')); } function LanguageLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $params['m_lang'] = $object->GetID(); @@ -89,7 +89,7 @@ function SelectedLanguage($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ if (array_key_exists('type', $params) && $params['type'] == 'data') { Index: units/mailing_lists/mailing_list_tp.php =================================================================== --- units/mailing_lists/mailing_list_tp.php (revision 15137) +++ units/mailing_lists/mailing_list_tp.php (working copy) @@ -18,7 +18,7 @@ function PrintRecipients($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $mailing_list_helper = $this->Application->recallObject('MailingListHelper'); @@ -55,7 +55,7 @@ return false; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return $object->IsNewItem(); Index: units/modules/modules_tag_processor.php =================================================================== --- units/modules/modules_tag_processor.php (revision 15137) +++ units/modules/modules_tag_processor.php (working copy) @@ -33,7 +33,7 @@ return true; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ $modules_helper = $this->Application->recallObject('ModulesHelper'); @@ -49,7 +49,7 @@ return true; } - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ $modules_helper = $this->Application->recallObject('ModulesHelper'); @@ -69,7 +69,7 @@ { static $errors = Array (); - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ $module_path = $object->GetDBField('Path'); @@ -105,7 +105,7 @@ function InstallLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ $module_path = strtolower( $object->GetDBField('Path') ); Index: units/page_revisions/page_revision_tp.php =================================================================== --- units/page_revisions/page_revision_tp.php (revision 15137) +++ units/page_revisions/page_revision_tp.php (working copy) @@ -18,7 +18,7 @@ function LastAutoSaveAgo($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $page_helper = $this->Application->recallObject('PageHelper'); Index: units/promo_block_groups/promo_block_group_tp.php =================================================================== --- units/promo_block_groups/promo_block_group_tp.php (revision 15111) +++ units/promo_block_groups/promo_block_group_tp.php (working copy) @@ -25,7 +25,7 @@ */ protected function PrintCategories(Array $params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $ret = ''; @@ -54,7 +54,7 @@ */ protected function EditLink(Array $params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $prefix = $object->getPrefixSpecial(); Index: units/promo_blocks/promo_block_tp.php =================================================================== --- units/promo_blocks/promo_block_tp.php (revision 15137) +++ units/promo_blocks/promo_block_tp.php (working copy) @@ -25,7 +25,7 @@ */ protected function PromoLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $url_params = Array ( @@ -46,7 +46,7 @@ */ protected function LinkInNewWindow($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ if ( $object->GetDBField('LinkType') == 1 ) { // Internal Index: units/related_searches/related_searches_tag_processor.php =================================================================== --- units/related_searches/related_searches_tag_processor.php (revision 15111) +++ units/related_searches/related_searches_tag_processor.php (working copy) @@ -24,7 +24,7 @@ */ function RelatedSearchUrl($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $keyword = $object->GetDBField('Keyword'); return $this->Application->HREF($params['search_template'],'', Array('keywords' => $keyword)); Index: units/reviews/reviews_tag_processor.php =================================================================== --- units/reviews/reviews_tag_processor.php (revision 15137) +++ units/reviews/reviews_tag_processor.php (working copy) @@ -24,7 +24,7 @@ */ function ItemEditLink($params) { - $object =& $this->getObject(); + $object = $this->getObject($params); /* @var $object kDBList */ $item_prefix = $this->Application->findModule('Name', $object->GetDBField('Module'), 'Var'); @@ -45,7 +45,7 @@ function HelpfulLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $parent_prefix = $this->Application->getUnitOption($this->Prefix, 'ParentPrefix'); @@ -65,7 +65,7 @@ { static $cache = null; - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $parent_prefix = $this->Application->getUnitOption($this->Prefix, 'ParentPrefix'); @@ -119,7 +119,7 @@ { $field = $this->SelectParam($params, 'name,field'); - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ if ($field == 'ReviewText') { @@ -150,7 +150,7 @@ function HasError($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return method_exists($object, 'GetErrorMsg') ? parent::HasError($params) : 0; @@ -164,7 +164,7 @@ */ function PageLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var kDBList */ $parent_info = $object->getLinkedInfo(); @@ -224,7 +224,7 @@ */ function VotesIndicator($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $rating_helper = $this->Application->recallObject('RatingHelper'); Index: units/selectors/selectors_tag_processor.php =================================================================== --- units/selectors/selectors_tag_processor.php (revision 15111) +++ units/selectors/selectors_tag_processor.php (working copy) @@ -18,9 +18,9 @@ function PrintStyle($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object SelectorsItem */ - + $style_data = $object->GetDBField( $params['field'] ); $ret = $object->CompileStyleBody( getArrayValue($params,'inline') ? STYLE_INLINE : STYLE_PREVIEW ); @@ -75,12 +75,12 @@ { $field = $params['field']; - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $value = $object->GetDBField($field); $subfield = getArrayValue($params, 'subfield'); - + if ( $subfield && $subfield != '$subfield' ) { $value = $value[$subfield]; } Index: units/spam_reports/spam_report_tp.php =================================================================== --- units/spam_reports/spam_report_tp.php (revision 15111) +++ units/spam_reports/spam_report_tp.php (working copy) @@ -24,7 +24,7 @@ */ function ItemEditLink($params) { - $object =& $this->getObject(); + $object = $this->getObject($params); /* @var $object kDBList */ $prefix = $object->GetDBField('ItemPrefix'); @@ -57,7 +57,7 @@ */ function AssocItemDeleteLink($params) { - $object =& $this->getObject(); + $object = $this->getObject($params); /* @var $object kDBList */ $prefix = $this->getPrefixSpecial(); @@ -80,7 +80,7 @@ */ protected function IsReviewReport($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return preg_match('/rev$/', $object->GetDBField('ItemPrefix')); Index: units/statistics/statistics_tag_processor.php =================================================================== --- units/statistics/statistics_tag_processor.php (revision 15137) +++ units/statistics/statistics_tag_processor.php (working copy) @@ -24,7 +24,7 @@ function CalculateValue($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $this->CurrentSQL = $object->GetDBField($params['field']); // 1. replace prefix to actual one @@ -103,7 +103,7 @@ return $this->TagCache[$tag]; } - $object =& $this->getObject(); + $object = $this->getObject(); /* @var $object kDBItem */ list($tag_name, $tag_params) = explode(' ', $tag, 2); // 1st - function, 2nd .. nth - params Index: units/themes/themes_tag_processor.php =================================================================== --- units/themes/themes_tag_processor.php (revision 15137) +++ units/themes/themes_tag_processor.php (working copy) @@ -26,7 +26,7 @@ function SelectedTheme($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $themes_helper = $this->Application->recallObject('ThemesHelper'); /* @var $themes_helper kThemesHelper */ Index: units/thesaurus/thesaurus_tp.php =================================================================== --- units/thesaurus/thesaurus_tp.php (revision 15111) +++ units/thesaurus/thesaurus_tp.php (working copy) @@ -18,7 +18,7 @@ function SubSearchLink($params) { - $object =& $this->getObject(); + $object = $this->getObject($params); /* @var $object kDBItem */ $params['search_type'] = 'subsearch'; Index: units/users/users_tag_processor.php =================================================================== --- units/users/users_tag_processor.php (revision 15137) +++ units/users/users_tag_processor.php (working copy) @@ -102,7 +102,7 @@ if ( !is_numeric($user_id) ) { // used for error reporting only -> rewrite code + theme (by Alex) - $object =& $this->getObject( Array('skip_autoload' => true) ); // TODO: change theme too + $object = $this->getObject( Array('skip_autoload' => true) ); // TODO: change theme too /* @var $object UsersItem */ $object->SetError('PwResetConfirm', $user_id, $this->_getUserCodeErrorMsg($user_id, $code_type, $params)); @@ -130,7 +130,7 @@ if ( $error_code ) { // used for error reporting only -> rewrite code + theme (by Alex) - $object =& $this->getObject(Array ('skip_autoload' => true)); // TODO: change theme too + $object = $this->getObject(Array ('skip_autoload' => true)); // TODO: change theme too /* @var $object UsersItem */ $object->SetError('PwResetConfirm', 'restore', $params[$error_code]); @@ -199,7 +199,7 @@ */ protected function LoginName($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object UsersItem */ return $object->GetID() != USER_ROOT ? $object->GetDBField('Username') : 'root'; @@ -244,7 +244,7 @@ */ function ProfileLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); $params['user_id'] = $object->GetID(); return $this->Application->ProcessParsedTag('m', 'Link', $params); @@ -260,7 +260,7 @@ { static $loggedin_status = Array (); - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBList */ if (!isset($loggedin_status[$this->Special])) { @@ -282,7 +282,7 @@ */ function ActivationLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $code = $this->getCachedCode(); Index: units/visits/visits_tag_processor.php =================================================================== --- units/visits/visits_tag_processor.php (revision 15111) +++ units/visits/visits_tag_processor.php (working copy) @@ -20,7 +20,7 @@ { $virtual_users = Array(USER_ROOT, USER_GUEST, 0); - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ return !in_array( $object->GetDBField( $params['user_field'] ) , $virtual_users ); @@ -36,7 +36,7 @@ */ protected function UserLink($params) { - $object =& $this->getObject($params); + $object = $this->getObject($params); /* @var $object kDBItem */ $user_id = $object->GetDBField( $params['user_field'] );