diff options
author | Côme Chilliet <come.chilliet@nextcloud.com> | 2022-03-22 14:53:37 +0100 |
---|---|---|
committer | Côme Chilliet (Rebase PR Action) <come-nc@users.noreply.github.com> | 2022-03-31 08:38:05 +0000 |
commit | 9fc00fdb8289a0e1b65be39a5afa7d5ea8513e74 (patch) | |
tree | b661911d24fe2a98b0884a9428d9c9ce6c40958b /apps | |
parent | bd9c4fbc070cf41974900eb1fe03d3b72fcf1e01 (diff) | |
download | nextcloud-server-9fc00fdb8289a0e1b65be39a5afa7d5ea8513e74.tar.gz nextcloud-server-9fc00fdb8289a0e1b65be39a5afa7d5ea8513e74.zip |
Avoid updating _lastChange when nothing is changed in the configuration
Had to set at least one var when creating an empty configuration in
order to save the default values.
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/user_ldap/lib/Command/CreateEmptyConfig.php | 1 | ||||
-rw-r--r-- | apps/user_ldap/lib/Configuration.php | 5 | ||||
-rw-r--r-- | apps/user_ldap/lib/Controller/ConfigAPIController.php | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/apps/user_ldap/lib/Command/CreateEmptyConfig.php b/apps/user_ldap/lib/Command/CreateEmptyConfig.php index 8b1736e3a53..f7f04e28e60 100644 --- a/apps/user_ldap/lib/Command/CreateEmptyConfig.php +++ b/apps/user_ldap/lib/Command/CreateEmptyConfig.php @@ -59,6 +59,7 @@ class CreateEmptyConfig extends Command { protected function execute(InputInterface $input, OutputInterface $output): int { $configPrefix = $this->helper->getNextServerConfigurationPrefix(); $configHolder = new Configuration($configPrefix); + $configHolder->ldapConfigurationActive = false; $configHolder->saveConfiguration(); $prose = ''; diff --git a/apps/user_ldap/lib/Configuration.php b/apps/user_ldap/lib/Configuration.php index 799ff27a896..c16823d39ee 100644 --- a/apps/user_ldap/lib/Configuration.php +++ b/apps/user_ldap/lib/Configuration.php @@ -56,10 +56,9 @@ class Configuration { */ protected $configRead = false; /** - * @var string[] pre-filled with one reference key so that at least one entry is written on save request and - * the config ID is registered + * @var string[] */ - protected $unsavedChanges = ['ldapConfigurationActive' => 'ldapConfigurationActive']; + protected array $unsavedChanges = []; /** * @var array<string, mixed> settings diff --git a/apps/user_ldap/lib/Controller/ConfigAPIController.php b/apps/user_ldap/lib/Controller/ConfigAPIController.php index 72ded754880..e408d03fcd5 100644 --- a/apps/user_ldap/lib/Controller/ConfigAPIController.php +++ b/apps/user_ldap/lib/Controller/ConfigAPIController.php @@ -118,6 +118,7 @@ class ConfigAPIController extends OCSController { try { $configPrefix = $this->ldapHelper->getNextServerConfigurationPrefix(); $configHolder = new Configuration($configPrefix); + $configHolder->ldapConfigurationActive = false; $configHolder->saveConfiguration(); } catch (\Exception $e) { $this->logger->logException($e); |