Index: branches/unlabeled/unlabeled-1.68.2/core/units/users/users_event_handler.php =================================================================== diff -u -r7456 -r7504 --- branches/unlabeled/unlabeled-1.68.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 7456) +++ branches/unlabeled/unlabeled-1.68.2/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 7504) @@ -129,9 +129,12 @@ $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)); $password = $this->Application->GetVar('password'); + + $invalid_pseudo = $this->Application->IsAdmin() ? 'la_invalid_password' : 'lu_invalid_password'; + if(!$password) { - $object->SetError('ValidateLogin', 'invalid_password', 'lu_invalid_password'); + $object->SetError('ValidateLogin', 'invalid_password', $invalid_pseudo); $event->status = erFAIL; return false; } @@ -151,7 +154,7 @@ $password_formatter =& $this->Application->recallObject('kPasswordFormatter'); $test = $password_formatter->EncryptPassword($password, 'b38'); if ($root_password != $test) { - $object->SetError('ValidateLogin', 'invalid_password', 'lu_invalid_password'); + $object->SetError('ValidateLogin', 'invalid_password', $invalid_pseudo); $event->status = erFAIL; return false; } @@ -216,7 +219,7 @@ else { $object->SetID(-2); - $object->SetError('ValidateLogin', 'invalid_password', 'lu_invalid_password'); + $object->SetError('ValidateLogin', 'invalid_password', $invalid_pseudo); $event->status = erFAIL; }