diff options
| author | provokateurin <kate@provokateurin.de> | 2025-04-07 09:55:05 +0200 |
|---|---|---|
| committer | provokateurin <kate@provokateurin.de> | 2025-04-07 10:23:23 +0200 |
| commit | d44b42fd240d4fae075f93ec45bfb09e4a1d7c1b (patch) | |
| tree | 33bbcdf7340d5eaf401504d1b90e95da5901ad22 /lib | |
| parent | 6c708a936e9826337fea1e821aa0726fa82af293 (diff) | |
| download | nextcloud-server-d44b42fd240d4fae075f93ec45bfb09e4a1d7c1b.tar.gz nextcloud-server-d44b42fd240d4fae075f93ec45bfb09e4a1d7c1b.zip | |
Revert "refactor: add migration for email setting"backport/51982/stable30
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 8be4179886b..0bb13854d9a 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -1377,7 +1377,6 @@ return array( 'OC\\Core\\Migrations\\Version30000Date20240814180800' => $baseDir . '/core/Migrations/Version30000Date20240814180800.php', 'OC\\Core\\Migrations\\Version30000Date20240815080800' => $baseDir . '/core/Migrations/Version30000Date20240815080800.php', 'OC\\Core\\Migrations\\Version30000Date20240906095113' => $baseDir . '/core/Migrations/Version30000Date20240906095113.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 310f9bb1b79..8ae4a9dc23d 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1410,7 +1410,6 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2 'OC\\Core\\Migrations\\Version30000Date20240814180800' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240814180800.php', 'OC\\Core\\Migrations\\Version30000Date20240815080800' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240815080800.php', 'OC\\Core\\Migrations\\Version30000Date20240906095113' => __DIR__ . '/../../..' . '/core/Migrations/Version30000Date20240906095113.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 5958a247025..1f519179065 100644 --- a/lib/private/User/User.php +++ b/lib/private/User/User.php @@ -429,7 +429,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)); } /** |