Index: branches/5.2.x/core/install.php =================================================================== diff -u -N -r15130 -r15137 --- branches/5.2.x/core/install.php (.../install.php) (revision 15130) +++ branches/5.2.x/core/install.php (.../install.php) (revision 15137) @@ -1,6 +1,6 @@ Application->GetVar('next_preset'); if ($next_preset !== false) { - $user_helper =& $this->Application->recallObject('UserHelper'); + $user_helper = $this->Application->recallObject('UserHelper'); /* @var $user_helper UserHelper */ $username = $this->Application->GetVar('login'); @@ -422,7 +422,7 @@ 'domain' => base64_encode($_SERVER['HTTP_HOST']), ); - $curl_helper =& $this->Application->recallObject('CurlHelper'); + $curl_helper = $this->Application->recallObject('CurlHelper'); /* @var $curl_helper kCurlHelper */ $curl_helper->SetRequestData($url_params); @@ -483,7 +483,7 @@ fwrite($fp, "Application->recallObject('CurlHelper'); + $curl_helper = $this->Application->recallObject('CurlHelper'); /* @var $curl_helper kCurlHelper */ $output = $curl_helper->Send($this->Application->BaseURL(WRITEBALE_BASE) . 'install_check.php'); @@ -684,7 +684,7 @@ case 2: // Upload License File $file_data = array_map('trim', file($_FILES['license_file']['tmp_name'])); if ((count($file_data) == 3) && $file_data[1]) { - $modules_helper =& $this->Application->recallObject('ModulesHelper'); + $modules_helper = $this->Application->recallObject('ModulesHelper'); /* @var $modules_helper kModulesHelper */ if ($modules_helper->verifyLicense($file_data[1])) { @@ -704,7 +704,7 @@ case 3: // Use Existing License $license_hash = $this->toolkit->getSystemConfig('Intechnic', 'License'); if ($license_hash) { - $modules_helper =& $this->Application->recallObject('ModulesHelper'); + $modules_helper = $this->Application->recallObject('ModulesHelper'); /* @var $modules_helper kModulesHelper */ if (!$modules_helper->verifyLicense($license_hash)) { @@ -733,7 +733,7 @@ $license_password = $this->GetVar('password'); $license_id = $this->GetVar('licenses'); - $curl_helper =& $this->Application->recallObject('CurlHelper'); + $curl_helper = $this->Application->recallObject('CurlHelper'); /* @var $curl_helper kCurlHelper */ if (strlen($license_login) && strlen($license_password) && !$license_id) { @@ -805,7 +805,7 @@ break; case 'select_domain': - $modules_helper =& $this->Application->recallObject('ModulesHelper'); + $modules_helper = $this->Application->recallObject('ModulesHelper'); /* @var $modules_helper kModulesHelper */ // get domain name as entered by user on the form @@ -867,7 +867,7 @@ $this->toolkit->saveConfigValues($config_values); - $user_helper =& $this->Application->recallObject('UserHelper'); + $user_helper = $this->Application->recallObject('UserHelper'); /* @var $user_helper UserHelper */ // login as "root", when no errors on password screen @@ -880,7 +880,7 @@ $this->Application->Session->SetField('Language', 1); // set imported language as primary - $lang =& $this->Application->recallObject('lang.-item', null, Array('skip_autoload' => true)); + $lang = $this->Application->recallObject('lang.-item', null, Array('skip_autoload' => true)); /* @var $lang LanguagesItem */ $lang->Load(1); // fresh install => ID=1 @@ -900,7 +900,7 @@ } // update category cache - $updater =& $this->Application->makeClass('kPermCacheUpdater'); + $updater = $this->Application->makeClass('kPermCacheUpdater'); /* @var $updater kPermCacheUpdater */ $updater->OneStepRun(); @@ -931,7 +931,7 @@ $theme_name = $this->Conn->GetOne($sql); $site_path = $this->toolkit->getSystemConfig('Misc', 'WebsitePath') . '/'; - $file_helper =& $this->Application->recallObject('FileHelper'); + $file_helper = $this->Application->recallObject('FileHelper'); /* @var $file_helper FileHelper */ foreach ($this->Application->ModuleInfo as $module_name => $module_info) { @@ -1007,7 +1007,7 @@ } // 3. update all theme language packs - $themes_helper =& $this->Application->recallObject('ThemesHelper'); + $themes_helper = $this->Application->recallObject('ThemesHelper'); /* @var $themes_helper kThemesHelper */ $themes_helper->synchronizeModule(false); @@ -1035,10 +1035,10 @@ $this->toolkit->rebuildThemes(); // compile admin skin, so it will be available in 3 frames at once - $skin_helper =& $this->Application->recallObject('SkinHelper'); + $skin_helper = $this->Application->recallObject('SkinHelper'); /* @var $skin_helper SkinHelper */ - $skin =& $this->Application->recallObject('skin', null, Array ('skip_autoload' => true)); + $skin = $this->Application->recallObject('skin', null, Array ('skip_autoload' => true)); /* @var $skin kDBItem */ $skin->Load(1, 'IsPrimary'); @@ -1067,7 +1067,7 @@ if ($this->currentStep == -1) { // step after last step -> redirect to admin - $user_helper =& $this->Application->recallObject('UserHelper'); + $user_helper = $this->Application->recallObject('UserHelper'); /* @var $user_helper UserHelper */ $user_helper->logoutUser();