From 3ee01143288212806e8816d09c981272a3df19f0 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 11 Apr 2016 19:59:40 +0200
Subject: [PATCH] OO-1984: allow empty email address in profil editor
---
src/main/java/org/olat/user/ProfileFormController.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/user/ProfileFormController.java b/src/main/java/org/olat/user/ProfileFormController.java
index e0eaee5fa0c..b7092601c40 100644
--- a/src/main/java/org/olat/user/ProfileFormController.java
+++ b/src/main/java/org/olat/user/ProfileFormController.java
@@ -423,6 +423,8 @@ 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)) {
// 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()
@@ -457,9 +459,8 @@ public class ProfileFormController extends FormBasicController {
if (emailChanged) {
removeAsListenerAndDispose(dialogCtr);
- String changerEMail = ureq.getIdentity().getUser().getProperty("email", ureq.getLocale());
String dialogText = "";
- if(changerEMail != null && changerEMail.length() > 0 && changerEMail.equals(currentEmail)) {
+ if(identityToModify.equals(ureq.getIdentity())) {
dialogText = translate("email.change.dialog.text");
} else {
dialogText = translate("email.change.dialog.text.usermanager");
--
GitLab