fixes missing error message on manual login of an unvalidated user

diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index f98f57faf51f0b9a32ae53fb8c8b502f9d15f634..a453f36a44cd387b9f167f159a1b9cc8d43ab674 100644 (file)
--- a/mod/uservalidationbyemail/start.php
+++ b/mod/uservalidationbyemail/start.php
@@ -238,8 +238,16 @@ function uservalidationbyemail_check_manual_login($event, $type, $user) {
        $access_status = access_get_show_hidden_status();
        access_show_hidden_entities(TRUE);
 
-       // @todo register_error()?
-       $return = ($user instanceof ElggUser && !$user->isEnabled() && !$user->validated) ? FALSE : NULL;
+       if(($user instanceof ElggUser) && !$user->isEnabled() && !$user->validated){
+               // send new validation email
+               uservalidationbyemail_request_validation($user->getGUID());
+               
+               // restore hidden entities settings
+               access_show_hidden_entities($access_status);
+               
+               // throw error so we get a nice error message
+               throw new LoginException(elgg_echo('uservalidationbyemail:login:fail'));
+       }
 
        access_show_hidden_entities($access_status);