diff options
| author | Aleksander Machniak <alec@alec.pl> | 2022-08-01 22:00:35 +0300 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2022-08-01 22:00:35 +0300 |
| commit | 44f0d6cbc4306ae6f9de1da4d5f69923937539f5 (patch) | |
| tree | 14528f41f0ade81f604fcc577e2e51dcea9dfb77 | |
| parent | 4e03113bb8635ae0a2a59dcf7dc0ed1d7cddc135 (diff) | |
Fix bug where renamed options were removed from the config on installto.sh (update.sh) run (#8643)
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | program/include/rcmail_install.php | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 81d6caa88..213aaa82e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Password: Remove references to %c variable that has been removed before (#8633) - Fix anchor links in HTML mail (#8632) - Fix bug where config creation in Installer did ignore options in the form (#8634) +- Fix bug where renamed options were removed from the config on installto.sh (update.sh) run (#8643) ## Release 1.6.0 diff --git a/program/include/rcmail_install.php b/program/include/rcmail_install.php index 6ced25a77..0585d0f94 100644 --- a/program/include/rcmail_install.php +++ b/program/include/rcmail_install.php @@ -110,6 +110,10 @@ class rcmail_install */ public function load_config() { + if ($this->configured) { + return; + } + // defaults if ($config = $this->load_config_file(RCUBE_CONFIG_DIR . 'defaults.inc.php')) { $this->config = (array) $config; @@ -431,6 +435,7 @@ class rcmail_install } unset($current[$prop]); + unset($current[$replacement]); } foreach ($this->obsolete_config as $prop) { |