Merge pull request #32070 from nextcloud/backport/31602/stable22

[stable22]  Do not update _lastChanged on auto-detected attributes
pull/32125/head
Côme Chilliet 2 years ago committed by GitHub
commit 49cd75b1af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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 = '';

@ -50,10 +50,9 @@ class Configuration {
protected $configPrefix = null;
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 $unsavedChanges = [];
//settings
protected $config = [
@ -262,6 +261,7 @@ class Configuration {
*/
public function saveConfiguration() {
$cta = array_flip($this->getConfigTranslationArray());
$changed = false;
foreach ($this->unsavedChanges as $key) {
$value = $this->config[$key];
switch ($key) {
@ -291,9 +291,12 @@ class Configuration {
if (is_null($value)) {
$value = '';
}
$changed = true;
$this->saveValue($cta[$key], $value);
}
$this->saveValue('_lastChange', time());
if ($changed) {
$this->saveValue('_lastChange', (string)time());
}
$this->unsavedChanges = [];
}

@ -117,6 +117,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);

Loading…
Cancel
Save