Merge pull request #33923 from nextcloud/backport/33813/stable22

blizzz · web-flow · commit 6e3b26fd2a8a · 2022-10-06T10:55:54.000+02:00
[stable22] Compare lowercase email when updating from ldap
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
@@ -193,7 +193,7 @@ public function setSystemEMailAddress(string $mailAddress): void {
 			$this->setPrimaryEMailAddress('');
 		}
 
-		if ($oldMailAddress !== $mailAddress) {
+		if ($oldMailAddress !== strtolower($mailAddress)) {
 			$this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public function setSystemEMailAddress(string $mailAddress): void {`
`193`	`193`	`$this->setPrimaryEMailAddress('');`
`194`	`194`	`}`
`195`	`195`
`196`		`- if ($oldMailAddress !== $mailAddress) {`
	`196`	`+ if ($oldMailAddress !== strtolower($mailAddress)) {`
`197`	`197`	`$this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress);`
`198`	`198`	`}`
`199`	`199`	`}`