Index: branches/5.2.x/core/install/install_toolkit.php =================================================================== diff -u -N -r15130 -r15137 --- branches/5.2.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 15130) +++ branches/5.2.x/core/install/install_toolkit.php (.../install_toolkit.php) (revision 15137) @@ -1,6 +1,6 @@ Application->recallObject('ModulesHelper'); + $modules_helper = $this->Application->recallObject('ModulesHelper'); /* @var $modules_helper kModulesHelper */ $file_data = explode('Code==:', $file_data); @@ -435,7 +435,7 @@ return ; } - $language_import_helper =& $this->Application->recallObject('LanguageImportHelper'); + $language_import_helper = $this->Application->recallObject('LanguageImportHelper'); /* @var $language_import_helper LanguageImportHelper */ $language_import_helper->performImport($lang_file, '|0|1|2|', '', $upgrade ? LANG_SKIP_EXISTING : LANG_OVERWRITE_EXISTING); @@ -683,7 +683,7 @@ return Array (); } - $xml_helper =& $this->Application->recallObject('kXMLHelper'); + $xml_helper = $this->Application->recallObject('kXMLHelper'); /* @var $xml_helper kXMLHelper */ $root_node =& $xml_helper->Parse( file_get_contents($info_file) ); @@ -761,14 +761,14 @@ static $fields = null; if ( !isset($fields) ) { - $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + $ml_formatter = $this->Application->recallObject('kMultiLanguage'); /* @var $ml_formatter kMultiLanguage */ $fields['name'] = $ml_formatter->LangFieldName('Name'); $fields['description'] = $ml_formatter->LangFieldName('Description'); } - $category =& $this->Application->recallObject('c', null, Array ('skip_autoload' => true)); + $category = $this->Application->recallObject('c', null, Array ('skip_autoload' => true)); /* @var $category kDBItem */ $category_fields = Array ( @@ -796,7 +796,7 @@ $category->Create(); - $priority_helper =& $this->Application->recallObject('PriorityHelper'); + $priority_helper = $this->Application->recallObject('PriorityHelper'); /* @var $priority_helper kPriorityHelper */ $event = new kEvent('c:OnListBuild'); @@ -869,7 +869,7 @@ $this->Application->UnitConfigReader->scanModules(MODULES_PATH . DIRECTORY_SEPARATOR . $module_folder); // create correct columns in CustomData table - $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); + $ml_helper = $this->Application->recallObject('kMultiLanguageHelper'); /* @var $ml_helper kMultiLanguageHelper */ $ml_helper->createFields($prefix . '-cdata', true); @@ -892,7 +892,7 @@ if ( $refresh_permissions ) { if ( $this->Application->ConfigValue('QuickCategoryPermissionRebuild') ) { // refresh permission without progress bar - $updater =& $this->Application->makeClass('kPermCacheUpdater'); + $updater = $this->Application->makeClass('kPermCacheUpdater'); /* @var $updater kPermCacheUpdater */ $updater->OneStepRun(); @@ -937,7 +937,7 @@ return ; } - $themes_helper =& $this->Application->recallObject('ThemesHelper'); + $themes_helper = $this->Application->recallObject('ThemesHelper'); /* @var $themes_helper kThemesHelper */ // use direct query, since module isn't yet in kApplication::ModuleInfo array @@ -948,7 +948,7 @@ $themes_helper->synchronizeModule($module_name); - $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); + $ml_helper = $this->Application->recallObject('kMultiLanguageHelper'); /* @var $ml_helper kMultiLanguageHelper */ $ml_helper->massCreateFields(); @@ -1028,7 +1028,7 @@ return true; } - $primary_skin =& $this->Application->recallObject('skin.primary', null, Array ('skip_autoload' => true)); + $primary_skin = $this->Application->recallObject('skin.primary', null, Array ('skip_autoload' => true)); /* @var $primary_skin kDBItem */ $primary_skin->Load(1, 'IsPrimary'); @@ -1038,7 +1038,7 @@ return false; } - $temp_handler =& $this->Application->recallObject('skin_TempHandler', 'kTempTablesHandler'); + $temp_handler = $this->Application->recallObject('skin_TempHandler', 'kTempTablesHandler'); /* @var $temp_handler kTempTablesHandler */ // clone current skin @@ -1049,7 +1049,7 @@ return false; } - $skin =& $this->Application->recallObject('skin.tmp', null, Array ('skip_autoload' => true)); + $skin = $this->Application->recallObject('skin.tmp', null, Array ('skip_autoload' => true)); /* @var $skin kDBItem */ $skin->Load($cloned_ids[0]);