Merge pull request #33920 from nextcloud/backport/33813/stable24

CarlSchwan · web-flow · commit 96675ccab285 · 2022-09-07T12:17:57.000+02:00
[stable24] Compare lowercase email when updating from ldap
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
@@ -190,7 +190,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
`@@ -190,7 +190,7 @@ public function setSystemEMailAddress(string $mailAddress): void {`
`190`	`190`	`$this->setPrimaryEMailAddress('');`
`191`	`191`	`}`
`192`	`192`
`193`		`- if ($oldMailAddress !== $mailAddress) {`
	`193`	`+ if ($oldMailAddress !== strtolower($mailAddress)) {`
`194`	`194`	`$this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress);`
`195`	`195`	`}`
`196`	`196`	`}`