Index: branches/5.2.x/core/units/users/users_event_handler.php =================================================================== diff -u -N -r15137 -r15145 --- branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15137) +++ branches/5.2.x/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 15145) @@ -1,6 +1,6 @@ getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $event->Special == 'forgot' || $object->getFormName() == 'registration' ) { @@ -105,7 +105,7 @@ { parent::SetCustomQuery($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBList */ if ( $event->Special == 'regular' ) { @@ -280,7 +280,7 @@ */ protected function OnLogin($event) { - $object =& $event->getObject( Array ('form_name' => 'login') ); + $object = $event->getObject( Array ('form_name' => 'login') ); /* @var $object kDBItem */ $field_values = $this->getSubmittedFields($event); @@ -419,7 +419,7 @@ return ; } - $object =& $event->getObject( Array('form_name' => 'registration') ); + $object = $event->getObject( Array('form_name' => 'registration') ); /* @var $object UsersItem */ $field_values = $this->getSubmittedFields($event); @@ -492,7 +492,7 @@ */ function autoLoginUser($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ if ( $object->GetDBField('Status') == STATUS_ACTIVE ) { @@ -524,7 +524,7 @@ $cs_helper = $this->Application->recallObject('CountryStatesHelper'); /* @var $cs_helper kCountryStatesHelper */ - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ if ( !$object->isSubscriberOnly() ) { @@ -593,7 +593,7 @@ */ protected function assignToPrimaryGroup($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $primary_group_id = $object->GetDBField('PrimaryGroupId'); @@ -623,7 +623,7 @@ */ protected function OnAfterItemValidate(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $resource_id = $object->GetDBField('ResourceId'); @@ -640,7 +640,7 @@ */ function OnRecommend($event) { - $object =& $event->getObject( Array ('form_name' => 'recommend') ); + $object = $event->getObject( Array ('form_name' => 'recommend') ); /* @var $object kDBItem */ $field_values = $this->getSubmittedFields($event); @@ -678,7 +678,7 @@ */ function OnUpdateAddress($event) { - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object kDBItem */ $items_info = $this->Application->GetVar($event->getPrefixSpecial(true)); @@ -710,7 +710,7 @@ */ function OnSubscribeQuery($event) { - $object =& $event->getObject( Array ('form_name' => 'subscription') ); + $object = $event->getObject( Array ('form_name' => 'subscription') ); /* @var $object UsersItem */ $field_values = $this->getSubmittedFields($event); @@ -743,7 +743,7 @@ */ function OnSubscribeUser($event) { - $object =& $event->getObject( Array ('form_name' => 'subscription') ); + $object = $event->getObject( Array ('form_name' => 'subscription') ); /* @var $object UsersItem */ $user_email = $this->Application->GetVar('subscriber_email'); @@ -844,7 +844,7 @@ */ function OnForgotPassword($event) { - $object =& $event->getObject( Array ('form_name' => 'forgot_password') ); + $object = $event->getObject( Array ('form_name' => 'forgot_password') ); /* @var $object kDBItem */ $field_values = $this->getSubmittedFields($event); @@ -939,7 +939,7 @@ $cs_helper->CheckStateField($event, 'State', 'Country'); $cs_helper->PopulateStates($event, 'State', 'Country'); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( $event->Special == 'forgot' ) { @@ -967,7 +967,7 @@ */ function beforeItemChanged($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ if ( !$this->Application->isAdmin && $object->getFormName() == 'registration' ) { @@ -1003,7 +1003,7 @@ { $event->SetRedirectParam('opener', 's'); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ $next_template = false; @@ -1092,7 +1092,7 @@ $item_info = $this->Application->GetVar( $event->getPrefixSpecial(true) ); list($id, $field_values) = each($item_info); - $object =& $event->getObject( Array ('skip_autoload' => true) ); + $object = $event->getObject( Array ('skip_autoload' => true) ); /* @var $object kDBItem */ $object->setID($id); @@ -1206,7 +1206,7 @@ } if ( $user_id == USER_ROOT ) { - $object =& $event->getObject(Array ('skip_autoload' => true)); + $object = $event->getObject(Array ('skip_autoload' => true)); /* @var $object UsersItem */ // put salt to user's config @@ -1243,7 +1243,7 @@ } } else { - $object =& $event->getObject(); + $object = $event->getObject(); $object->SetFieldsFromHash($field_values, $this->getRequestProtectedFields($field_values)); if ( !$object->Update() ) { @@ -1298,7 +1298,7 @@ */ protected function checkItemStatus(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ if ( !$object->isLoaded() ) { @@ -1323,7 +1323,7 @@ $this->afterItemChanged($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ if ( !$this->Application->isAdmin && ($event->Special != 'email-restore') ) { @@ -1346,7 +1346,7 @@ { $this->saveUserImages($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ if ( $object->GetDBField('EmailPassword') && $object->GetDBField('Password_plain') ) { @@ -1406,7 +1406,7 @@ $email_passwords = unserialize($email_passwords); if ( isset($email_passwords[$temp_id]) ) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->SwitchToLive(); @@ -1487,7 +1487,7 @@ */ protected function sendEmailChangeEvent(kEvent $event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ $new_email = $object->GetDBField('Email'); @@ -1633,7 +1633,7 @@ { parent::OnBeforeClone($event); - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ $object->generatePassword(); @@ -1720,7 +1720,7 @@ $image_helper = $this->Application->recallObject('ImageHelper'); /* @var $image_helper ImageHelper */ - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object UsersItem */ $image_helper->LoadItemImages($object); @@ -1760,7 +1760,7 @@ $image_helper = $this->Application->recallObject('ImageHelper'); /* @var $image_helper ImageHelper */ - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ // process image upload in virtual fields @@ -1783,7 +1783,7 @@ return; } - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $user_type = $this->Application->GetVar('user_type'); @@ -1810,7 +1810,7 @@ */ function _makePasswordRequired($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $required_fields = Array ('Password', 'Password_plain', 'VerifyPassword', 'VerifyPassword_plain'); @@ -1831,7 +1831,7 @@ if ( $id < 0 ) { // when root, guest and so on - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $object->Clear($id); @@ -1882,7 +1882,7 @@ */ function OnResetLostPassword($event) { - $object =& $event->getObject(); + $object = $event->getObject(); /* @var $object kDBItem */ $event->CallSubEvent('OnUpdate');