Index: branches/5.2.x/core/units/admin/admin_events_handler.php =================================================================== diff -u -N -r15130 -r15137 --- branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 15130) +++ branches/5.2.x/core/units/admin/admin_events_handler.php (.../admin_events_handler.php) (revision 15137) @@ -1,6 +1,6 @@ Application->isAdminUser; } - $perm_helper =& $this->Application->recallObject('PermissionsHelper'); + $perm_helper = $this->Application->recallObject('PermissionsHelper'); /* @var $perm_helper kPermissionsHelper */ $csv_events = Array ('OnCSVImportBegin', 'OnCSVImportStep', 'OnExportCSV', 'OnGetCSV'); if ( in_array($event->Name, $csv_events) ) { - $csv_helper =& $this->Application->recallObject('CSVHelper'); + $csv_helper = $this->Application->recallObject('CSVHelper'); /* @var $csv_helper kCSVHelper */ $prefix = $csv_helper->getPrefix(stripos($event->Name, 'import') !== false); @@ -173,7 +173,7 @@ $this->OnResetParsedData($event); - $skin_helper =& $this->Application->recallObject('SkinHelper'); + $skin_helper = $this->Application->recallObject('SkinHelper'); /* @var $skin_helper SkinHelper */ $skin_helper->deleteCompiled(); @@ -227,7 +227,7 @@ */ protected function OnCompileTemplates(kEvent $event) { - $compiler =& $this->Application->recallObject('NParserCompiler'); + $compiler = $this->Application->recallObject('NParserCompiler'); /* @var $compiler NParserCompiler */ $compiler->CompileTemplatesStep(); @@ -475,7 +475,7 @@ $event->status = kEvent::erSTOP; } - $themes_helper =& $this->Application->recallObject('ThemesHelper'); + $themes_helper = $this->Application->recallObject('ThemesHelper'); /* @var $themes_helper kThemesHelper */ $themes_helper->refreshThemes(); @@ -492,7 +492,7 @@ */ protected function OnSaveColumns(kEvent $event) { - $picker_helper =& $this->Application->recallObject('ColumnPickerHelper'); + $picker_helper = $this->Application->recallObject('ColumnPickerHelper'); /* @var $picker_helper kColumnPickerHelper */ $picker_helper->SetGridName($this->Application->GetLinkedVar('grid_name')); @@ -594,7 +594,7 @@ */ protected function OnExportCSV(kEvent $event) { - $csv_helper =& $this->Application->recallObject('CSVHelper'); + $csv_helper = $this->Application->recallObject('CSVHelper'); /* @var $csv_helper kCSVHelper */ $csv_helper->PrefixSpecial = $csv_helper->getPrefix(false); @@ -612,7 +612,7 @@ */ protected function OnGetCSV(kEvent $event) { - $csv_helper =& $this->Application->recallObject('CSVHelper'); + $csv_helper = $this->Application->recallObject('CSVHelper'); /* @var $csv_helper kCSVHelper */ $csv_helper->GetCSV(); @@ -637,7 +637,7 @@ $result = 'required'; if ( $object->GetDBField('ImportFile') ) { - $csv_helper =& $this->Application->recallObject('CSVHelper'); + $csv_helper = $this->Application->recallObject('CSVHelper'); /* @var $csv_helper kCSVHelper */ $csv_helper->PrefixSpecial = $csv_helper->getPrefix(true); @@ -666,7 +666,7 @@ */ protected function OnCSVImportStep(kEvent $event) { - $import_helper =& $this->Application->recallObject('CSVHelper'); + $import_helper = $this->Application->recallObject('CSVHelper'); /* @var $import_helper kCSVHelper */ $import_helper->ImportStep(); @@ -740,7 +740,7 @@ */ protected function OnBackup(kEvent $event) { - $backup_helper =& $this->Application->recallObject('BackupHelper'); + $backup_helper = $this->Application->recallObject('BackupHelper'); /* @var $backup_helper BackupHelper */ if ( !$backup_helper->initBackup() ) { @@ -759,7 +759,7 @@ */ protected function OnBackupProgress(kEvent $event) { - $backup_helper =& $this->Application->recallObject('BackupHelper'); + $backup_helper = $this->Application->recallObject('BackupHelper'); /* @var $backup_helper BackupHelper */ $done_percent = $backup_helper->performBackup(); @@ -794,7 +794,7 @@ */ protected function OnRestore(kEvent $event) { - $backup_helper =& $this->Application->recallObject('BackupHelper'); + $backup_helper = $this->Application->recallObject('BackupHelper'); /* @var $backup_helper BackupHelper */ $backup_helper->initRestore(); @@ -810,7 +810,7 @@ */ protected function OnRestoreProgress(kEvent $event) { - $backup_helper =& $this->Application->recallObject('BackupHelper'); + $backup_helper = $this->Application->recallObject('BackupHelper'); /* @var $backup_helper BackupHelper */ $done_percent = $backup_helper->performRestore(); @@ -854,7 +854,7 @@ */ protected function OnDeleteBackup(kEvent $event) { - $backup_helper =& $this->Application->recallObject('BackupHelper'); + $backup_helper = $this->Application->recallObject('BackupHelper'); /* @var $backup_helper BackupHelper */ $backup_helper->delete(); @@ -988,7 +988,7 @@ } } - $json_helper =& $this->Application->recallObject('JSONHelper'); + $json_helper = $this->Application->recallObject('JSONHelper'); /* @var $json_helper JSONHelper */ echo $json_helper->encode($ret); @@ -1019,7 +1019,7 @@ $ret['result'] = $res ? 'OK' : 'FAILED'; } - $json_helper =& $this->Application->recallObject('JSONHelper'); + $json_helper = $this->Application->recallObject('JSONHelper'); /* @var $json_helper JSONHelper */ echo $json_helper->encode($ret); @@ -1036,7 +1036,7 @@ */ protected function OnDeploy(kEvent $event) { - $deployment_helper =& $this->Application->recallObject('DeploymentHelper'); + $deployment_helper = $this->Application->recallObject('DeploymentHelper'); /* @var $deployment_helper DeploymentHelper */ $deployment_helper->deployAll(); @@ -1062,7 +1062,7 @@ */ protected function OnSynchronizeDBRevisions(kEvent $event) { - $deployment_helper =& $this->Application->recallObject('DeploymentHelper'); + $deployment_helper = $this->Application->recallObject('DeploymentHelper'); /* @var $deployment_helper DeploymentHelper */ if ( $deployment_helper->deployAll(true) ) {