diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-07-28 17:09:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-28 17:09:59 +0200 |
| commit | bf7afcdaceee39c8b3ca1c143c24eae798721aef (patch) | |
| tree | 15312a423c4eb4761168e7e168cb6cbf045547aa | |
| parent | 73cdc88e8cc2d319a6f65588d7b0128bdae619c4 (diff) | |
| parent | 77df09d58a2c28729b7d7b234884da89e49931f1 (diff) | |
| download | nextcloud-server-bf7afcdaceee39c8b3ca1c143c24eae798721aef.tar.gz nextcloud-server-bf7afcdaceee39c8b3ca1c143c24eae798721aef.zip | |
Merge pull request #592 from nextcloud/ldap-avoidneedlesssetemailonlogin
Prevent setting email and triggering events at login time (#25553)
| -rw-r--r-- | apps/user_ldap/lib/User/User.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php index 56d881c5d5a..3d247663b3f 100644 --- a/apps/user_ldap/lib/User/User.php +++ b/apps/user_ldap/lib/User/User.php @@ -435,7 +435,10 @@ class User { if(!is_null($email)) { $user = $this->userManager->get($this->uid); if (!is_null($user)) { - $user->setEMailAddress($email); + $currentEmail = $user->getEMailAddress(); + if ($currentEmail !== $email) { + $user->setEMailAddress($email); + } } } } |