diff options
| author | provokateurin <kate@provokateurin.de> | 2025-04-07 09:55:05 +0200 |
|---|---|---|
| committer | provokateurin <kate@provokateurin.de> | 2025-04-07 09:55:09 +0200 |
| commit | 8da9c0f48cd487c5bfd1ad7f60997366a98d841e (patch) | |
| tree | acd38e92917be700c9d5552f0f40ba9b8e2b227d /apps/provisioning_api/lib/Controller/UsersController.php | |
| parent | 554dfbbdda8bbaff1901c1bee850fd035622ed65 (diff) | |
| download | nextcloud-server-revert/email-setting-migration.tar.gz nextcloud-server-revert/email-setting-migration.zip | |
Revert "refactor: add migration for email setting"revert/email-setting-migration
This reverts commit e7859f0dacbda051c2decb2e0d62345435ac2fd9.
Signed-off-by: provokateurin <kate@provokateurin.de>
Diffstat (limited to 'apps/provisioning_api/lib/Controller/UsersController.php')
| -rw-r--r-- | apps/provisioning_api/lib/Controller/UsersController.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 6629440482d..4b3db45f518 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -757,7 +757,7 @@ class UsersController extends AUserDataOCSController { } // Fallback to display name value to avoid changing behavior with the new option. - if ($this->config->getSystemValue('allow_user_to_change_email', true)) { + if ($this->config->getSystemValue('allow_user_to_change_email', $allowDisplayNameChange)) { $permittedFields[] = IAccountManager::PROPERTY_EMAIL; } @@ -918,7 +918,8 @@ class UsersController extends AUserDataOCSController { $permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME; } - if ($this->config->getSystemValue('allow_user_to_change_email', true)) { + // Fallback to display name value to avoid changing behavior with the new option. + if ($this->config->getSystemValue('allow_user_to_change_email', $allowDisplayNameChange)) { $permittedFields[] = IAccountManager::PROPERTY_EMAIL; } |