From 6f09b8f085fdacc42a964864e586e0252cdfc053 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 15 Apr 2016 09:55:32 +0200
Subject: [PATCH] OO-1984: check if the email is not null (guests don't have
emails)
---
src/main/java/org/olat/user/ProfileFormController.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/user/ProfileFormController.java b/src/main/java/org/olat/user/ProfileFormController.java
index b7092601c40..5dd9355f2e3 100644
--- a/src/main/java/org/olat/user/ProfileFormController.java
+++ b/src/main/java/org/olat/user/ProfileFormController.java
@@ -53,6 +53,7 @@ import org.olat.core.helpers.Settings;
import org.olat.core.id.Identity;
import org.olat.core.id.OLATResourceable;
import org.olat.core.id.User;
+import org.olat.core.util.StringHelper;
import org.olat.core.util.WebappHelper;
import org.olat.core.util.coordinate.CoordinatorManager;
import org.olat.core.util.coordinate.SyncerExecutor;
@@ -423,12 +424,10 @@ public class ProfileFormController extends FormBasicController {
identityToModify = updateIdentityFromFormData(identityToModify);
changedEmail = identityToModify.getUser().getProperty("email", null);
- //if ((currentEmail == null && StringHelper.containsNonWhitespace(changedEmail))
- // || (currentEmail != null && !currentEmail.equals(changedEmail))) {
- if (!currentEmail.equals(changedEmail)) {
+ if ((currentEmail == null && StringHelper.containsNonWhitespace(changedEmail))
+ || (currentEmail != null && !currentEmail.equals(changedEmail))) {
// allow an admin to change email without verification workflow. usermanager is only permitted to do so, if set by config.
- if ( !(ureq.getUserSession().getRoles().isOLATAdmin()
- || (BaseSecurityModule.USERMANAGER_CAN_BYPASS_EMAILVERIFICATION && ureq.getUserSession().getRoles().isUserManager() ))) {
+ if ( !(ureq.getUserSession().getRoles().isOLATAdmin() || (BaseSecurityModule.USERMANAGER_CAN_BYPASS_EMAILVERIFICATION && ureq.getUserSession().getRoles().isUserManager()))) {
emailChanged = true;
// change email address to old address until it is verified
identityToModify.getUser().setProperty("email", currentEmail);
--
GitLab