diff options
Diffstat (limited to 'lib/private/User')
| -rw-r--r-- | lib/private/User/Database.php | 4 | ||||
| -rw-r--r-- | lib/private/User/User.php | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php index 0b38f04bfe3..f106c2e8b6d 100644 --- a/lib/private/User/Database.php +++ b/lib/private/User/Database.php @@ -212,11 +212,13 @@ class Database extends ABackend implements * @param string $displayName The new display name * @return bool * + * @throws \InvalidArgumentException + * * Change the display name of a user */ public function setDisplayName(string $uid, string $displayName): bool { if (mb_strlen($displayName) > 64) { - return false; + throw new \InvalidArgumentException('Invalid displayname'); } $this->fixDI(); diff --git a/lib/private/User/User.php b/lib/private/User/User.php index fd8763f46b9..eda6b5f79d9 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -154,6 +154,9 @@ class User implements IUser { * * @param string $displayName * @return bool + * + * @since 25.0.0 Throw InvalidArgumentException + * @throws \InvalidArgumentException */ public function setDisplayName($displayName) { $displayName = trim($displayName); @@ -196,7 +199,7 @@ class User implements IUser { $this->setPrimaryEMailAddress(''); } - if ($oldMailAddress !== $mailAddress) { + if ($oldMailAddress !== strtolower($mailAddress)) { $this->triggerChange('eMailAddress', $mailAddress, $oldMailAddress); } } |