Merge OpenOLAT 12.3.x to OpenOLAT default with 49551e2f892ba7c28fc30fae7e7f3a93d4bc7f6a

src/main/java/org/olat/registration/RegistrationController.java

@@ -303,7 +303,7 @@ public class RegistrationController extends BasicController implements Activatea
 				};
 
 				boolean isMailSent = false;
-				if (UserManager.getInstance().isEmailAllowed(email)) {
+				if (registrationManager.isRegistrationPending(email) || UserManager.getInstance().isEmailAllowed(email)) {
 					TemporaryKey tk = null;
 					if (userModule.isEmailUnique()) {
 						tk = registrationManager.loadTemporaryKeyByEmail(email);

src/main/java/org/olat/registration/RegistrationManager.java

@@ -370,18 +370,21 @@ public class RegistrationManager {
 				}
 			}
 		}
-		tk = loadTemporaryKeyByAction(RegistrationManager.REGISTRATION);
-		if (tk != null) {
-			for (TemporaryKey temporaryKey : tk) {
+		return isRegistrationPending(emailAddress);
+	}
+
+	public boolean isRegistrationPending(String emailAddress) {
+		List<TemporaryKey> temporaryKeys = loadTemporaryKeyByAction(RegistrationManager.REGISTRATION);
+		if (temporaryKeys != null) {
+			for (TemporaryKey temporaryKey : temporaryKeys) {
 				if (emailAddress.equalsIgnoreCase(temporaryKey.getEmailAddress())) {
 					return true;
 				}
 			}
 		}
-		
 		return false;
 	}
-
+	
 	/**
 	 * Evaluates whether the given identity needs to accept a disclaimer before
 	 * logging in or not.