Index: branches/5.2.x/core/kernel/processors/main_processor.php =================================================================== diff -u -N -r15100 -r15137 --- branches/5.2.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 15100) +++ branches/5.2.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 15137) @@ -1,6 +1,6 @@ Application->recallObject('kActions'); + $actions = $this->Application->recallObject('kActions'); /* @var $actions Params */ $actions->Set('t', $this->Application->GetVar('t')); @@ -191,7 +191,7 @@ $name = $params['name']; $method = $params['method']; - $tmp =& $this->Application->recallObject($name); + $tmp = $this->Application->recallObject($name); if ($tmp != null) { if (method_exists($tmp, $method)) return $tmp->$method($params); @@ -448,7 +448,7 @@ $value_list = $this->Conn->GetOne($sql); if ( $value_list ) { - $helper =& $this->Application->recallObject('InpCustomFieldsHelper'); + $helper = $this->Application->recallObject('InpCustomFieldsHelper'); /* @var $helper InpCustomFieldsHelper */ $options = $helper->GetValuesHash($value_list); @@ -488,7 +488,7 @@ */ protected function DumpSystemInfo($params) { - $actions =& $this->Application->recallObject('kActions'); + $actions = $this->Application->recallObject('kActions'); /* @var $actions Params */ $actions->Set('t', $this->Application->GetVar('t')); @@ -517,7 +517,7 @@ $form_fields = Array (); if ( $this->Application->RewriteURLs() ) { - $session =& $this->Application->recallObject('Session'); + $session = $this->Application->recallObject('Session'); /* @var $session Session */ if ( $session->NeedQueryString() ) { @@ -584,13 +584,13 @@ $phrase_key = mb_strtoupper($phrase_name); if ( $default_translation && strpos($translation, '!' . $phrase_key . '!') !== false ) { - $phrase =& $this->Application->recallObject('phrases.autocreate', null, Array ('skip_autoload' => true)); + $phrase = $this->Application->recallObject('phrases.autocreate', null, Array ('skip_autoload' => true)); /* @var $phrase kDBItem */ if ( !$phrase->Load($phrase_key, 'PhraseKey') ) { $phrase->SetDBField('Phrase', $phrase_name); - $ml_helper =& $this->Application->recallObject('kMultiLanguageHelper'); + $ml_helper = $this->Application->recallObject('kMultiLanguageHelper'); /* @var $ml_helper kMultiLanguageHelper */ $languages = $ml_helper->getLanguages(); @@ -823,7 +823,7 @@ */ function CheckPermission($params) { - $perm_helper =& $this->Application->recallObject('PermissionsHelper'); + $perm_helper = $this->Application->recallObject('PermissionsHelper'); /* @var $perm_helper kPermissionsHelper */ return $perm_helper->TagPermissionCheck($params); @@ -848,7 +848,7 @@ (isset($params['perm_prefix']) && $params['perm_prefix']) || (isset($params['permissions']) && $params['permissions'])) { - $perm_helper =& $this->Application->recallObject('PermissionsHelper'); + $perm_helper = $this->Application->recallObject('PermissionsHelper'); /* @var $perm_helper kPermissionsHelper */ $perm_status = $perm_helper->TagPermissionCheck($params); @@ -986,7 +986,7 @@ $require = $this->Application->ConfigValue('Require_AdminSSL'); } - $http_query =& $this->Application->recallObject('HTTPQuery'); + $http_query = $this->Application->recallObject('HTTPQuery'); /* @var $http_query kHTTPQuery */ $pass = $http_query->getRedirectParams(); @@ -1064,7 +1064,7 @@ return $this->Application->XMLHeader(getArrayValue($params, 'xml_version')); } - $lang =& $this->Application->recallObject('lang.current'); + $lang = $this->Application->recallObject('lang.current'); /* @var $lang LanguagesItem */ header('Content-type: text/html; charset=' . $lang->GetDBField('Charset')); @@ -1131,7 +1131,7 @@ $path = FULL_PATH . '/' . $params['path']; $pseudo = isset($params['special']) ? 'EmailSender.' . $params['special'] : 'EmailSender'; - $esender =& $this->Application->recallObject($pseudo); + $esender = $this->Application->recallObject($pseudo); /* @var $esender kEmailSendingHelper */ if ( file_exists($path) ) { @@ -1144,7 +1144,7 @@ $this->NoDebug($params); $this->Application->SetVar('skip_last_template', 1); - $captcha_helper =& $this->Application->recallObject('CaptchaHelper'); + $captcha_helper = $this->Application->recallObject('CaptchaHelper'); /* @var $captcha_helper kCaptchaHelper */ // generate captcha code