Index: branches/unlabeled/unlabeled-1.78.2/kernel/frontaction.php =================================================================== diff -u -r7954 -r7955 --- branches/unlabeled/unlabeled-1.78.2/kernel/frontaction.php (.../frontaction.php) (revision 7954) +++ branches/unlabeled/unlabeled-1.78.2/kernel/frontaction.php (.../frontaction.php) (revision 7955) @@ -102,7 +102,6 @@ $objSession->SetVariable('codevalidationresult', 'lu_resetpw_confirm_text'); $newpw = makepassword(); SetVar('user_password', $newpw); - $application->SetVar('user_password', $newpw); $u->Set("Password",$newpw); $u->Set("PassResetTime", adodb_mktime()); $u->Set("PwResetConfirm", ''); Index: branches/unlabeled/unlabeled-1.71.2/core/units/users/users_event_handler.php =================================================================== diff -u -r7874 -r7955 --- branches/unlabeled/unlabeled-1.71.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 7874) +++ branches/unlabeled/unlabeled-1.71.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 7955) @@ -439,7 +439,7 @@ if($user_email) { // check if is subscriber - $verify_user =& $this->Application->recallObject('u.verify', null, Array('skup_autoload' => true) ); + $verify_user =& $this->Application->recallObject('u.verify', null, Array('skip_autoload' => true) ); $verify_user->Load($user_email, 'Email'); if( $verify_user->isLoaded() && $verify_user->isSubscriberOnly() ) { Index: branches/unlabeled/unlabeled-1.29.2/core/units/email_events/email_events_event_handler.php =================================================================== diff -u -r7944 -r7955 --- branches/unlabeled/unlabeled-1.29.2/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 7944) +++ branches/unlabeled/unlabeled-1.29.2/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 7955) @@ -251,7 +251,7 @@ // $replacement_tags = $replacement_tags ? unserialize($replacement_tags) : Array (); $replacement_tags = Array ( - ' ' ' ' 'Application->EmailEventUser('USER.VALIDATE', $this->GetID() ); } else { - $this->Application->EmailEventAdmin('USER.ADD', $this->GetID() ); - $this->Application->EmailEventUser('USER.ADD', $this->GetID() ); + $this->Application->EmailEventAdmin('USER.ADD', $this->GetID() ); + $this->Application->EmailEventUser('USER.ADD', $this->GetID() ); } break;