Index: branches/5.2.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r15130 -r15137
--- branches/5.2.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 15130)
+++ branches/5.2.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 15137)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_event_handler.php 15130 2012-03-03 18:38:32Z alex $
+* @version	$Id: db_event_handler.php 15137 2012-03-04 08:06:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -218,10 +218,10 @@
 			}
 
 			if ( $event->Special == 'previous' || $event->Special == 'next' ) {
-				$object =& $this->Application->recallObject($event->getEventParam('item'));
+				$object = $this->Application->recallObject($event->getEventParam('item'));
 				/* @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);
@@ -235,7 +235,7 @@
 
 			if ( preg_match('/^auto-(.*)/', $event->Special, $regs) && $this->Application->prefixRegistred($regs[1]) ) {
 				// <inp2:lang.auto-phrase_Field name="DateFormat"/> - returns field DateFormat value from language (LanguageId is extracted from current phrase object)
-				$main_object =& $this->Application->recallObject($regs[1]);
+				$main_object = $this->Application->recallObject($regs[1]);
 				/* @var $main_object kDBItem */
 
 				$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
@@ -625,7 +625,7 @@
 				}
 			}
 
-			$actions =& $this->Application->recallObject('kActions');
+			$actions = $this->Application->recallObject('kActions');
 			/* @var $actions Params */
 
 			$actions->Set($event->getPrefixSpecial() . '_GoTab', '');
@@ -642,7 +642,7 @@
 		 */
 		protected function OnTempHandlerBuild(kEvent $event)
 		{
-			$object =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
+			$object = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler');
 			/* @var $object kTempTablesHandler */
 
 			$parent_event = $event->getEventParam('parent_event');
@@ -689,7 +689,7 @@
 			}
 
 			if ( $object->Load($id) ) {
-				$actions =& $this->Application->recallObject('kActions');
+				$actions = $this->Application->recallObject('kActions');
 				/* @var $actions Params */
 
 				$actions->Set($event->getPrefixSpecial() . '_id', $object->GetID());
@@ -744,7 +744,7 @@
 			$this->SetPagination($event);
 			$this->SetSorting($event);
 
-			$actions =& $this->Application->recallObject('kActions');
+			$actions = $this->Application->recallObject('kActions');
 			/* @var $actions Params */
 
 			$actions->Set('remove_specials[' . $event->getPrefixSpecial() . ']', '0');
@@ -804,7 +804,7 @@
 			$event->SetRedirectParam('pass', 'all,' . $event->getPrefixSpecial());
 
 			if ( !$this->Application->isAdminUser ) {
-				$list_helper =& $this->Application->recallObject('ListHelper');
+				$list_helper = $this->Application->recallObject('ListHelper');
 				/* @var $list_helper ListHelper */
 
 				$this->_passListParams($event, 'per_page');
@@ -841,7 +841,7 @@
 		{
 			$param_names = array_diff(Array ('page', 'per_page', 'sort_by'), Array ($skip_var));
 
-			$list_helper =& $this->Application->recallObject('ListHelper');
+			$list_helper = $this->Application->recallObject('ListHelper');
 			/* @var $list_helper ListHelper */
 
 			foreach ($param_names as $param_name) {
@@ -1000,7 +1000,7 @@
 
 			if ( !$per_page ) {
 				// per page wan't found in request/session/persistent session
-				$list_helper =& $this->Application->recallObject('ListHelper');
+				$list_helper = $this->Application->recallObject('ListHelper');
 				/* @var $list_helper ListHelper */
 
 				// allow to override default per-page value from tag
@@ -1224,7 +1224,7 @@
 			if ( $view_filter ) {
 				$view_filter = unserialize($view_filter);
 
-				$temp_filter =& $this->Application->makeClass('kMultipleFilter');
+				$temp_filter = $this->Application->makeClass('kMultipleFilter');
 				/* @var $temp_filter kMultipleFilter */
 
 				$filter_menu = $this->Application->getUnitOption($event->Prefix, 'FilterMenu');
@@ -1393,7 +1393,7 @@
 					$object =& $event->getObject(Array ('main_list' => 1));
 					/* @var $object kDBList */
 
-					$list_helper =& $this->Application->recallObject('ListHelper');
+					$list_helper = $this->Application->recallObject('ListHelper');
 					/* @var $list_helper ListHelper */
 
 					$this->_passListParams($event, 'sort_by');
@@ -1625,7 +1625,7 @@
 				return;
 			}
 
-			$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
 			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->DeleteItems($event->Prefix, $event->Special, Array ($this->getPassedID($event)));
@@ -1645,7 +1645,7 @@
 			$ids = $this->Conn->GetCol($sql);
 
 			if ( $ids ) {
-				$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+				$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
 				/* @var $temp_handler kTempTablesHandler */
 
 				$temp_handler->DeleteItems($event->Prefix, $event->Special, $ids);
@@ -1697,7 +1697,7 @@
 			if ( $items_info ) {
 				$delete_ids = Array ();
 
-				$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+				$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
 				/* @var $temp_handler kTempTablesHandler */
 
 				foreach ($items_info as $id => $field_values) {
@@ -1732,7 +1732,7 @@
 				return ;
 			}
 
-			$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
 			/* @var $temp_handler kTempTablesHandler */
 
 			$ids = $this->StoreSelectedIDs($event);
@@ -1788,7 +1788,7 @@
 			$changes_var_name = $this->Prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
 			$this->Application->RemoveVar($changes_var_name);
 
-			$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
 			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->PrepareEdit();
@@ -1815,7 +1815,7 @@
 			}
 
 			$skip_master = false;
-			$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
 			/* @var $temp_handler kTempTablesHandler */
 
 			$changes_var_name = $this->Prefix . '_changes_' . $this->Application->GetTopmostWid($this->Prefix);
@@ -1961,7 +1961,7 @@
 		 */
 		protected function OnCancelEdit(kEvent $event)
 		{
-			$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
 			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->CancelEdit();
@@ -2116,7 +2116,7 @@
 			$object =& $event->getObject(Array ('skip_autoload' => true));
 			/* @var $object kDBItem */
 
-			$temp_handler =& $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+			$temp_handler = $this->Application->recallObject($event->Prefix . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
 			/* @var $temp_handler kTempTablesHandler */
 
 			$temp_handler->PrepareEdit();
@@ -2256,7 +2256,7 @@
 				return;
 			}
 
-			$temp_handler =& $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
+			$temp_handler = $this->Application->recallObject($event->getPrefixSpecial() . '_TempHandler', 'kTempTablesHandler', Array ('parent_event' => $event));
 			/* @var $temp_handler kTempTablesHandler */
 
 			$ids = $this->StoreSelectedIDs($event);
@@ -2601,7 +2601,7 @@
 		{
 			$event->setPseudoClass('_List');
 
-			$search_helper =& $this->Application->recallObject('SearchHelper');
+			$search_helper = $this->Application->recallObject('SearchHelper');
 			/* @var $search_helper kSearchHelper */
 
 			$search_helper->performSearch($event);
@@ -2616,7 +2616,7 @@
 		 */
 		protected function OnSearchReset(kEvent $event)
 		{
-			$search_helper =& $this->Application->recallObject('SearchHelper');
+			$search_helper = $this->Application->recallObject('SearchHelper');
 			/* @var $search_helper kSearchHelper */
 
 			$search_helper->resetSearch($event);
@@ -2730,7 +2730,7 @@
 				if ( $resource_id ) {
 					$t_prefixes = explode(',', $this->Application->GetVar('translator_prefixes'));
 
-					$cdata =& $this->Application->recallObject($t_prefixes[1], null, Array ('skip_autoload' => true));
+					$cdata = $this->Application->recallObject($t_prefixes[1], null, Array ('skip_autoload' => true));
 					/* @var $cdata kDBItem */
 
 					$cdata->Load($resource_id, 'ResourceId');
@@ -2850,7 +2850,7 @@
 			$this->Application->LinkVar('export_progress_t');
 			$this->Application->StoreVar('export_oroginal_special', $event->Special);
 
-			$export_helper =& $this->Application->recallObject('CatItemExportHelper');
+			$export_helper = $this->Application->recallObject('CatItemExportHelper');
 
 			/*list ($index_file, $env) = explode('|', $this->Application->RecallVar('last_template'));
 			$finish_url = $this->Application->BaseURL('/admin') . $index_file . '?' . ENV_VAR_NAME . '=' . $env;
@@ -2877,7 +2877,7 @@
 		protected function prepareObject(&$object, kEvent $event)
 		{
 			if ( $event->Special == 'export' || $event->Special == 'import' ) {
-				$export_helper =& $this->Application->recallObject('CatItemExportHelper');
+				$export_helper = $this->Application->recallObject('CatItemExportHelper');
 				/* @var $export_helper kCatDBItemExportHelper */
 
 				$export_helper->prepareExportColumns($event);
@@ -2905,7 +2905,7 @@
 		 */
 		protected function OnExportBegin(kEvent $event)
 		{
-			$export_helper =& $this->Application->recallObject('CatItemExportHelper');
+			$export_helper = $this->Application->recallObject('CatItemExportHelper');
 			/* @var $export_helper kCatDBItemExportHelper */
 
 			$export_helper->OnExportBegin($event);
@@ -3065,13 +3065,13 @@
 				return;
 			}
 
-			$file_helper =& $this->Application->recallObject('FileHelper');
+			$file_helper = $this->Application->recallObject('FileHelper');
 			/* @var $file_helper FileHelper */
 
 			$fname = $file_helper->ensureUniqueFilename($tmp_path, $fname);
 
 			if ( $storage_format ) {
-				$image_helper =& $this->Application->recallObject('ImageHelper');
+				$image_helper = $this->Application->recallObject('ImageHelper');
 				/* @var $image_helper ImageHelper */
 
 				move_uploaded_file($value['tmp_name'], $value['tmp_name'] . '.jpg'); // add extension, so ResizeImage can work
@@ -3123,7 +3123,7 @@
 			// this prevents session from auto-expiring when KeepSessionOnBrowserClose & FireFox is used
 			$this->Application->HttpQuery->Cookie[$cookie_name . '_live'] = $this->Application->GetVar('flashsid');
 
-			$admin_ses =& $this->Application->recallObject('Session.admin');
+			$admin_ses = $this->Application->recallObject('Session.admin');
 			/* @var $admin_ses Session */
 
 			if ( $admin_ses->RecallVar('user_id') == USER_ROOT ) {
@@ -3217,7 +3217,7 @@
 				$url = $object->GetField($field, 'full_url'); // don't use "file_urls" format to prevent recursion
 			}
 
-			$file_helper =& $this->Application->recallObject('FileHelper');
+			$file_helper = $this->Application->recallObject('FileHelper');
 			/* @var $file_helper FileHelper */
 
 			$path = $file_helper->urlToPath($url);
@@ -3242,7 +3242,7 @@
 		 */
 		protected function OnValidateMInputFields(kEvent $event)
 		{
-			$minput_helper =& $this->Application->recallObject('MInputHelper');
+			$minput_helper = $this->Application->recallObject('MInputHelper');
 			/* @var $minput_helper MInputHelper */
 
 			$minput_helper->OnValidateMInputFields($event);
@@ -3289,7 +3289,7 @@
 				$response['status'] = $object->GetErrorMsg($error_field);
 			}
 
-			$ajax_form_helper =& $this->Application->recallObject('AjaxFormHelper');
+			$ajax_form_helper = $this->Application->recallObject('AjaxFormHelper');
 			/* @var $ajax_form_helper AjaxFormHelper */
 
 			$response['other_errors'] = $ajax_form_helper->getErrorMessages($object);
@@ -3359,10 +3359,10 @@
 		{
 			$event->status = kEvent::erSTOP;
 
-			/*$lang =& $this->Application->recallObject('lang.current');
+			/*$lang = $this->Application->recallObject('lang.current');
 			header('Content-type: text/xml; charset=' . $lang->GetDBField('Charset'));*/
 
-			$picker_helper =& $this->Application->RecallObject('ColumnPickerHelper');
+			$picker_helper = $this->Application->recallObject('ColumnPickerHelper');
 			/* @var $picker_helper kColumnPickerHelper */
 
 			$picker_helper->PreparePicker($event->getPrefixSpecial(), $this->Application->GetVar('grid_name'));