Merge pull request #592 from nextcloud/ldap-avoidneedlesssetemailonlogin

LukasReschke · web-flow · commit bf7afcdaceee · 2016-07-28T17:09:59.000+02:00
Prevent setting email and triggering events at login time (#25553)
diff --git a/apps/user_ldap/lib/User/User.php b/apps/user_ldap/lib/User/User.php
@@ -435,7 +435,10 @@ public function updateEmail($valueFromLDAP = null) {
 		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);
+				}
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,10 @@ public function updateEmail($valueFromLDAP = null) {`
`435`	`435`	`if(!is_null($email)) {`
`436`	`436`	`$user = $this->userManager->get($this->uid);`
`437`	`437`	`if (!is_null($user)) {`
`438`		`- $user->setEMailAddress($email);`
	`438`	`+ $currentEmail = $user->getEMailAddress();`
	`439`	`+ if ($currentEmail !== $email) {`
	`440`	`+ $user->setEMailAddress($email);`
	`441`	`+ }`
`439`	`442`	`}`
`440`	`443`	`}`
`441`	`444`	`}`