mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24900 from nextcloud/fix/user-settings 

Fix updating user settings
This commit is contained in:
Julius Härtl 2021-01-05 23:01:59 +01:00 committed by GitHub
parent ef0732384f 90d0732828
commit 5fa935d6d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
apps/settings/lib/Controller/UsersController.php
View File

@ -333,34 +333,35 @@ class UsersController extends Controller {
* @NoSubAdminRequired * @NoSubAdminRequired
* @PasswordConfirmationRequired * @PasswordConfirmationRequired
* *
* @param string $avatarScope * @param string|null $avatarScope
* @param string $displayname * @param string|null $displayname
* @param string $displaynameScope * @param string|null $displaynameScope
* @param string $phone * @param string|null $phone
* @param string $phoneScope * @param string|null $phoneScope
* @param string $email * @param string|null $email
* @param string $emailScope * @param string|null $emailScope
* @param string $website * @param string|null $website
* @param string $websiteScope * @param string|null $websiteScope
* @param string $address * @param string|null $address
* @param string $addressScope * @param string|null $addressScope
* @param string $twitter * @param string|null $twitter
* @param string $twitterScope * @param string|null $twitterScope
*
* @return DataResponse * @return DataResponse
*/ */
public function setUserSettings(string $avatarScope, public function setUserSettings(?string $avatarScope = null,
string $displayname, ?string $displayname = null,
string $displaynameScope, ?string $displaynameScope = null,
string $phone, ?string $phone = null,
string $phoneScope, ?string $phoneScope = null,
string $email, ?string $email = null,
string $emailScope, ?string $emailScope = null,
string $website, ?string $website = null,
string $websiteScope, ?string $websiteScope = null,
string $address, ?string $address = null,
string $addressScope, ?string $addressScope = null,
string $twitter, ?string $twitter = null,
string $twitterScope ?string $twitterScope = null
) { ) {
$email = strtolower($email); $email = strtolower($email);
if (!empty($email) && !$this->mailer->validateMailAddress($email)) { if (!empty($email) && !$this->mailer->validateMailAddress($email)) {