diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-01-05 23:01:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-05 23:01:59 +0100 |
| commit | 5fa935d6d6c93ccecd91b942d5014c1a4ed463bd (patch) | |
| tree | b75908e162ab57fed87e2a181c62196366719b47 /apps | |
| parent | ef0732384f0e63aad743319b3e90400cde3ad02f (diff) | |
| parent | 90d0732828c957f55b8025e98818325ad229d995 (diff) | |
| download | nextcloud-server-5fa935d6d6c93ccecd91b942d5014c1a4ed463bd.tar.gz nextcloud-server-5fa935d6d6c93ccecd91b942d5014c1a4ed463bd.zip | |
Merge pull request #24900 from nextcloud/fix/user-settings
Fix updating user settings
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings/lib/Controller/UsersController.php | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php index 1b3159fdc4b..cd34dd7266f 100644 --- a/apps/settings/lib/Controller/UsersController.php +++ b/apps/settings/lib/Controller/UsersController.php @@ -333,34 +333,35 @@ class UsersController extends Controller { * @NoSubAdminRequired * @PasswordConfirmationRequired * - * @param string $avatarScope - * @param string $displayname - * @param string $displaynameScope - * @param string $phone - * @param string $phoneScope - * @param string $email - * @param string $emailScope - * @param string $website - * @param string $websiteScope - * @param string $address - * @param string $addressScope - * @param string $twitter - * @param string $twitterScope + * @param string|null $avatarScope + * @param string|null $displayname + * @param string|null $displaynameScope + * @param string|null $phone + * @param string|null $phoneScope + * @param string|null $email + * @param string|null $emailScope + * @param string|null $website + * @param string|null $websiteScope + * @param string|null $address + * @param string|null $addressScope + * @param string|null $twitter + * @param string|null $twitterScope + * * @return DataResponse */ - public function setUserSettings(string $avatarScope, - string $displayname, - string $displaynameScope, - string $phone, - string $phoneScope, - string $email, - string $emailScope, - string $website, - string $websiteScope, - string $address, - string $addressScope, - string $twitter, - string $twitterScope + public function setUserSettings(?string $avatarScope = null, + ?string $displayname = null, + ?string $displaynameScope = null, + ?string $phone = null, + ?string $phoneScope = null, + ?string $email = null, + ?string $emailScope = null, + ?string $website = null, + ?string $websiteScope = null, + ?string $address = null, + ?string $addressScope = null, + ?string $twitter = null, + ?string $twitterScope = null ) { $email = strtolower($email); if (!empty($email) && !$this->mailer->validateMailAddress($email)) { |