Merge pull request #593 from nextcloud/ldap-avoidneedlesssetemailonlogin-stable10

[stable10] Prevent setting email and triggering events at login time (#25554)
This commit is contained in:
Morris Jobke 2016-08-01 18:22:20 +02:00 committed by GitHub
commit 481418ff40
1 changed files with 4 additions and 1 deletions

View File

@ -435,7 +435,10 @@ class User {
if(!is_null($email)) { if(!is_null($email)) {
$user = $this->userManager->get($this->uid); $user = $this->userManager->get($this->uid);
if (!is_null($user)) { if (!is_null($user)) {
$user->setEMailAddress($email); $currentEmail = $user->getEMailAddress();
if ($currentEmail !== $email) {
$user->setEMailAddress($email);
}
} }
} }
} }