Index: branches/5.2.x/units/listings/listings_tag_processor.php =================================================================== diff -u -N -r14958 -r15142 --- branches/5.2.x/units/listings/listings_tag_processor.php (.../listings_tag_processor.php) (revision 14958) +++ branches/5.2.x/units/listings/listings_tag_processor.php (.../listings_tag_processor.php) (revision 15142) @@ -1,6 +1,6 @@ getObject($params); /* @var $object kDBItem */ - $listing_type =& $this->Application->recallObject( 'lst', 'lst', $params ); + $listing_type = $this->Application->recallObject( 'lst', 'lst', $params ); /* @var $listing_type kDBItem */ $dur_type_mapping = Array ( @@ -82,7 +82,7 @@ $expiration_interval = $duration * $dur_type_mapping[$duration_type]; $expiration_date = adodb_mktime() + $expiration_interval; - $lang =& $this->Application->recallObject('lang.current'); + $lang = $this->Application->recallObject('lang.current'); /* @var $lang LanguagesItem */ return adodb_date($lang->GetDBField($format_field), $expiration_date); Index: branches/5.2.x/units/link_validation/link_validation_eh.php =================================================================== diff -u -N -r15135 -r15142 --- branches/5.2.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 15135) +++ branches/5.2.x/units/link_validation/link_validation_eh.php (.../link_validation_eh.php) (revision 15142) @@ -1,6 +1,6 @@ Application->recallObject('PermissionsHelper'); + $perm_helper = $this->Application->recallObject('PermissionsHelper'); /* @var $perm_helper kPermissionsHelper */ $items = $perm_helper->GetCategoryItemData('l', $ids); @@ -161,7 +161,7 @@ $ids = $this->Conn->GetCol($sql); if ($ids) { - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems($event->Prefix, $event->Special, $ids); @@ -319,7 +319,7 @@ function _validateLink($link_id) { - $curl_helper =& $this->Application->recallObject('CurlHelper'); + $curl_helper = $this->Application->recallObject('CurlHelper'); /* @var $curl_helper kCurlHelper */ $sql = 'SELECT Url, ResourceId @@ -338,7 +338,7 @@ $curl_helper->lastErrorCode = 500; } - $link_validation =& $this->Application->recallObject($this->Prefix . '.-item', null, Array ('skip_autoload' => true)); + $link_validation = $this->Application->recallObject($this->Prefix . '.-item', null, Array ('skip_autoload' => true)); /* @var $link_validation kDBItem */ $link_validation->Load($link_id, 'LinkId'); @@ -379,7 +379,7 @@ return ; } - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems($event->Prefix, $event->Special, $ids); @@ -435,7 +435,7 @@ return; } - $object =& $this->Application->recallObject('l.-item', null, Array ('skip_autoload' => true)); + $object = $this->Application->recallObject('l.-item', null, Array ('skip_autoload' => true)); /* @var $object kCatDBItem */ foreach ($ids as $id) { @@ -477,7 +477,7 @@ return ; } - $temp_handler =& $this->Application->recallObject('l_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject('l_TempHandler', 'kTempTablesHandler'); /* @var $temp_handler kTempTablesHandler */ $temp_handler->DeleteItems('l', '', $ids); Index: branches/5.2.x/units/listings/listings_event_handler.php =================================================================== diff -u -N -r15135 -r15142 --- branches/5.2.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 15135) +++ branches/5.2.x/units/listings/listings_event_handler.php (.../listings_event_handler.php) (revision 15142) @@ -1,6 +1,6 @@ UpdateLink('OnPurchase', $object->GetDBField('ItemResourceId'), $object->GetDBField('ListingTypeId')); - $listtype_object =& $this->Application->recallObject('lst'); + $listtype_object = $this->Application->recallObject('lst'); if ( $listtype_object->GetDBField('OnPurchaseAddToCatEnabled') ) { - $link_object =& $this->Application->recallObject('l'); + $link_object = $this->Application->recallObject('l'); $add_to_cat = (int)$listtype_object->GetDBField('OnPurchaseAddToCat'); $sql = 'DELETE FROM '.$this->Application->getUnitOption('l-ci', 'TableName').' WHERE CategoryId = '.$add_to_cat.' @@ -204,7 +204,7 @@ $this->UpdateLink('OnExpire', $original_values['ItemResourceId'], $original_values['ListingTypeId']); - $listtype_object =& $this->Application->recallObject('lst'); + $listtype_object = $this->Application->recallObject('lst'); if( $listtype_object->GetDBField('OnExpireRemoveFromCatEnabled') ) { $remove_from_cat = $listtype_object->GetDBField('OnExpireRemoveFromCat'); @@ -219,11 +219,11 @@ function UpdateLink($action_prefix, $resource_id, $listtype_id) { - $link_object =& $this->Application->recallObject('l', null, Array('skip_autoload' => true)); + $link_object = $this->Application->recallObject('l', null, Array('skip_autoload' => true)); $link_object->Load($resource_id, 'ResourceId'); // "-item", because can be called as regular after event, and just "lst" recalls list instead - $listtype_object =& $this->Application->recallObject('lst.-item', null, Array('skip_autoload' => true)); + $listtype_object = $this->Application->recallObject('lst.-item', null, Array('skip_autoload' => true)); $listtype_object->Load($listtype_id); $action_fields = Array( 'EdPick' => 'EditorsPick', @@ -280,7 +280,7 @@ list ($link_id, $link_info) = each($l_info); $listing_type_id = $link_info['ListingTypeId']; - $listing_type =& $this->Application->recallObject('lst', null, Array('skip_autoload' => true)); + $listing_type = $this->Application->recallObject('lst', null, Array('skip_autoload' => true)); $listing_type->Load($listing_type_id); if ($listing_type->GetDBField('EnableBuying')) { @@ -375,7 +375,7 @@ } // set expiration time for listing - $listing_type =& $this->Application->recallObject('lst', null, Array('skip_autoload' => true)); + $listing_type = $this->Application->recallObject('lst', null, Array('skip_autoload' => true)); $listing_type->Load($listing_type_id); $dur_type_mapping = Array( 1 => 1, @@ -500,7 +500,7 @@ $item_data = unserialize($fields['ItemData']); $listing_id = $item_data['ListingId']; - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject($event->getPrefixSpecial().'_TempHandler', 'kTempTablesHandler'); $temp_handler->DeleteItems($event->Prefix, $event->Special, Array($listing_id)); } @@ -579,7 +579,7 @@ // extend period for pending/renewal links (if owner has agreed) if ( $event->Name == 'OnMassApprove' ) { - $lst_object =& $this->Application->recallObject('lst', null, Array ('skip_autoload' => true)); + $lst_object = $this->Application->recallObject('lst', null, Array ('skip_autoload' => true)); /* @var $lst_object kDBItem */ foreach ($ids as $id) { @@ -734,7 +734,7 @@ $expired_listings = $this->Conn->GetCol($sql); if(is_array($expired_listings) && count($expired_listings) > 0) { - $object =& $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true)); + $object = $this->Application->recallObject($event->Prefix.'.-item', null, Array('skip_autoload' => true)); /* @var $object kDBItem */ foreach($expired_listings as $listing_id) Index: branches/5.2.x/units/links/links_event_handler.php =================================================================== diff -u -N -r15135 -r15142 --- branches/5.2.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 15135) +++ branches/5.2.x/units/links/links_event_handler.php (.../links_event_handler.php) (revision 15142) @@ -1,6 +1,6 @@ Special, 0, 10) == 'duplicates' ) { $object->removeFilter('category_filter'); - $link_helper =& $this->Application->recallObject('LinkHelper'); + $link_helper = $this->Application->recallObject('LinkHelper'); /* @var $link_helper LinkHelper */ $grouping = $link_helper->getGrouping($event->getPrefixSpecial()); @@ -75,7 +75,7 @@ break; case 'duplicates-sub': - $main_object =& $this->Application->recallObject($event->Prefix . '.duplicates'); + $main_object = $this->Application->recallObject($event->Prefix . '.duplicates'); /* @var $main_object kDBItem */ foreach ($grouping as $field_index => $group_field) { @@ -105,7 +105,7 @@ */ function OnMerge($event) { - $link_helper =& $this->Application->recallObject('LinkHelper'); + $link_helper = $this->Application->recallObject('LinkHelper'); /* @var $link_helper LinkHelper */ $grouping = $link_helper->getGrouping($event->getPrefixSpecial()); @@ -144,7 +144,7 @@ } if ( !$groping_error ) { - $temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler'); /* @var $temp_handler kTempTablesHandler */ $categories_sql = ' SELECT main_table.ResourceId, ci.CategoryId, main_table.' . $id_field . ' @@ -293,7 +293,7 @@ if (!strlen($field_value) || ($field_value != $this->Application->RecallVar($event->Prefix . '_captcha_code'))) { $this->Application->SetVar('error_'.$field_name, 1); - $captcha_helper =& $this->Application->recallObject('CaptchaHelper'); + $captcha_helper = $this->Application->recallObject('CaptchaHelper'); /* @var $captcha_helper kCaptchaHelper */ $this->Application->StoreVar($event->Prefix . '_captcha_code', $captcha_helper->GenerateCaptchaCode()); @@ -395,7 +395,7 @@ if ($object->GetDBField('Url') != $object->GetOriginalField('Url')) { // check only when url was changed - $link_helper =& $this->Application->recallObject('LinkHelper'); + $link_helper = $this->Application->recallObject('LinkHelper'); /* @var $link_helper LinkHelper */ $link_checked = $link_helper->CheckReciprocalURL($object->GetDBField('Url')); @@ -422,7 +422,7 @@ $object =& $event->getObject( Array('skip_autoload' => true) ); /* @var $object kCatDBItem */ - $link_helper =& $this->Application->recallObject('LinkHelper'); + $link_helper = $this->Application->recallObject('LinkHelper'); /* @var $link_helper LinkHelper */ $id_field = $this->Application->getUnitOption($event->Prefix, 'IDField'); Index: branches/5.2.x/units/links/link_tag_processor.php =================================================================== diff -u -N -r14835 -r15142 --- branches/5.2.x/units/links/link_tag_processor.php (.../link_tag_processor.php) (revision 14835) +++ branches/5.2.x/units/links/link_tag_processor.php (.../link_tag_processor.php) (revision 15142) @@ -1,6 +1,6 @@ getListingInfo($object->GetDBField('ResourceId'), 'ListingTypeId'); - $lst_object =& $this->Application->recallObject('lst', null, Array('skip_autoload' => true)); + $lst_object = $this->Application->recallObject('lst', null, Array('skip_autoload' => true)); $lst_object->Load($lst_id); return $lst_object->GetField( $this->SelectParam($params, 'name,field') ); @@ -105,7 +105,7 @@ $listing_id = $this->getListingInfo($object->GetDBField('ResourceId'), 'ListingId'); - $listing_object =& $this->Application->recallObject('ls', null, Array('skip_autoload' => true)); + $listing_object = $this->Application->recallObject('ls', null, Array('skip_autoload' => true)); $listing_object->Load($listing_id); return $listing_object->GetField( $this->SelectParam($params, 'name,field') ); @@ -155,7 +155,7 @@ $listtype_id = $this->getListingInfo($object->GetDBField('ResourceId'), 'ListingTypeId'); - $lst_object =& $this->Application->recallObject('lst', null, Array('skip_autoload' => true)); + $lst_object = $this->Application->recallObject('lst', null, Array('skip_autoload' => true)); $lst_object->Load($listtype_id); return $lst_object->GetDBField('EnableBuying'); @@ -180,15 +180,15 @@ function ListingDescription($params) { - $listing_type =& $this->Application->recallObject('lst'); + $listing_type = $this->Application->recallObject('lst'); /* @var $listing_type kDBItem */ return $listing_type->GetDBField('Description'); } function ListingTypeDetailsLink($params) { - $listing_type =& $this->Application->recallObject('lst', null, Array ('raise_warnings' => 0)); + $listing_type = $this->Application->recallObject('lst', null, Array ('raise_warnings' => 0)); /* @var $listing_type kDBList */ $params['lst_id'] = $listing_type->isLoaded() ? $listing_type->GetID() : $this->Application->Parser->GetParam('key'); @@ -312,7 +312,7 @@ if (isset($params['formatted']) && $params['formatted']) { // format the date - $lang =& $this->Application->recallObject('lang.current'); + $lang = $this->Application->recallObject('lang.current'); if (isset($params['display_time']) && $params['display_time']) { $display_format = $lang->GetDBField('DateFormat').' @ '.$lang->GetDBField('TimeFormat'); @@ -403,7 +403,7 @@ return ; } - $link_helper =& $this->Application->recallObject('LinkHelper'); + $link_helper = $this->Application->recallObject('LinkHelper'); /* @var $link_helper LinkHelper */ // 1. get current grouping @@ -441,7 +441,7 @@ static $grouping = null; if (!isset($grouping)) { - $link_helper =& $this->Application->recallObject('LinkHelper'); + $link_helper = $this->Application->recallObject('LinkHelper'); /* @var $link_helper LinkHelper */ // 1. get current grouping