Index: branches/5.2.x/core/units/helpers/user_helper.php =================================================================== diff -u -N -r15130 -r15137 --- branches/5.2.x/core/units/helpers/user_helper.php (.../user_helper.php) (revision 15130) +++ branches/5.2.x/core/units/helpers/user_helper.php (.../user_helper.php) (revision 15137) @@ -1,6 +1,6 @@ Application->isAdmin && ($username == 'root') || ($super_admin && $username == 'super-root')) { $root_password = $this->Application->ConfigValue('RootPass'); - $password_formatter =& $this->Application->recallObject('kPasswordFormatter'); + $password_formatter = $this->Application->recallObject('kPasswordFormatter'); /* @var $password_formatter kPasswordFormatter */ if ($root_password != $password_formatter->EncryptPassword($password, 'b38')) { @@ -271,7 +271,7 @@ $this->event = new kEvent('u:OnLogout'); } - $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize')); + $sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize')); /* @var $sync_manager UsersSyncronizeManager */ $sync_manager->performAction('LogoutUser'); @@ -281,7 +281,7 @@ $user_id = USER_GUEST; $this->Application->SetVar('u.current_id', $user_id); - $object =& $this->Application->recallObject('u.current', null, Array('skip_autoload' => true)); + $object = $this->Application->recallObject('u.current', null, Array('skip_autoload' => true)); /* @var $object UsersItem */ $object->Load($user_id); @@ -349,7 +349,7 @@ } // synchronize login - $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize')); + $sync_manager = $this->Application->recallObject('UsersSyncronizeManager', null, Array(), Array ('InPortalSyncronize')); /* @var $sync_manager UsersSyncronizeManager */ $sync_manager->performAction('LoginUser', $username, $password); @@ -415,7 +415,7 @@ { $prefix_special = $this->Application->isAdmin ? 'u.current' : 'u'; // "u" used on front not to change theme - $object =& $this->Application->recallObject($prefix_special, null, Array('skip_autoload' => true)); + $object = $this->Application->recallObject($prefix_special, null, Array('skip_autoload' => true)); /* @var $object UsersItem */ return $object; @@ -585,7 +585,7 @@ $email_to_restore = $prev_emails[$hash]; unset($prev_emails[$hash]); - $object =& $this->Application->recallObject('u.email-restore', null, Array ('skip_autoload' => true)); + $object = $this->Application->recallObject('u.email-restore', null, Array ('skip_autoload' => true)); /* @var $object UsersItem */ $object->Load($user_info['PortalUserId']);