Merge pull request #23735 from nextcloud/backport/23720/stable18

[stable18] save email as lower case
This commit is contained in:
Morris Jobke 2020-10-28 08:48:08 +01:00 committed by GitHub
commit cd102359f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -368,6 +368,7 @@ class UsersController extends Controller {
$twitter,
$twitterScope
) {
$email = strtolower($email);
if (!empty($email) && !$this->mailer->validateMailAddress($email)) {
return new DataResponse(
[
@ -447,7 +448,7 @@ class UsersController extends Controller {
}
}
$oldEmailAddress = $user->getEMailAddress();
$oldEmailAddress = is_null($oldEmailAddress) ? '' : $oldEmailAddress;
$oldEmailAddress = is_null($oldEmailAddress) ? '' : strtolower($oldEmailAddress);
if (isset($data[AccountManager::PROPERTY_EMAIL]['value'])
&& $oldEmailAddress !== $data[AccountManager::PROPERTY_EMAIL]['value']
) {