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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/composer/composer/autoload_classmap.php | 1 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_static.php | 1 | ||||
| -rw-r--r-- | lib/private/User/User.php | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 5f51750ac98..52e3075e413 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -1453,7 +1453,6 @@ return array( 'OC\\Core\\Migrations\\Version31000Date20240101084401' => $baseDir . '/core/Migrations/Version31000Date20240101084401.php', 'OC\\Core\\Migrations\\Version31000Date20240814184402' => $baseDir . '/core/Migrations/Version31000Date20240814184402.php', 'OC\\Core\\Migrations\\Version31000Date20250213102442' => $baseDir . '/core/Migrations/Version31000Date20250213102442.php', - 'OC\\Core\\Migrations\\Version32000Date20250402182800' => $baseDir . '/core/Migrations/Version32000Date20250402182800.php', 'OC\\Core\\Notification\\CoreNotifier' => $baseDir . '/core/Notification/CoreNotifier.php', 'OC\\Core\\ResponseDefinitions' => $baseDir . '/core/ResponseDefinitions.php', 'OC\\Core\\Service\\LoginFlowV2Service' => $baseDir . '/core/Service/LoginFlowV2Service.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index c06999c6480..e98bc3e1aaa 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1502,7 +1502,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Core\\Migrations\\Version31000Date20240101084401' => __DIR__ . '/../../..' . '/core/Migrations/Version31000Date20240101084401.php', 'OC\\Core\\Migrations\\Version31000Date20240814184402' => __DIR__ . '/../../..' . '/core/Migrations/Version31000Date20240814184402.php', 'OC\\Core\\Migrations\\Version31000Date20250213102442' => __DIR__ . '/../../..' . '/core/Migrations/Version31000Date20250213102442.php', - 'OC\\Core\\Migrations\\Version32000Date20250402182800' => __DIR__ . '/../../..' . '/core/Migrations/Version32000Date20250402182800.php', 'OC\\Core\\Notification\\CoreNotifier' => __DIR__ . '/../../..' . '/core/Notification/CoreNotifier.php', 'OC\\Core\\ResponseDefinitions' => __DIR__ . '/../../..' . '/core/ResponseDefinitions.php', 'OC\\Core\\Service\\LoginFlowV2Service' => __DIR__ . '/../../..' . '/core/Service/LoginFlowV2Service.php', diff --git a/lib/private/User/User.php b/lib/private/User/User.php index 9d61aaf48e0..f04977314e2 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -448,7 +448,8 @@ class User implements IUser { } public function canChangeEmail(): bool { - return $this->config->getSystemValueBool('allow_user_to_change_email', true); + // Fallback to display name value to avoid changing behavior with the new option. + return $this->config->getSystemValueBool('allow_user_to_change_email', $this->config->getSystemValueBool('allow_user_to_change_display_name', true)); } /** |