Fix bug where it wasn't possible to set timezone to auto-detected value (#5782)

release-1.2
Aleksander Machniak 7 years ago
parent 913ffcfbbe
commit 3d498cd632

@ -6,6 +6,7 @@ CHANGELOG Roundcube Webmail
- Fix bug where it wasn't possible to scroll folders list in Edge (#5750)
- Fix addressbook searching by gender (#5757)
- Fix SQL syntax error on MariaDB 10.2 (#5774)
- Fix bug where it wasn't possible to set timezone to auto-detected value (#5782)
RELEASE 1.2.5
-------------

@ -188,14 +188,16 @@ class rcube_user
$a_user_prefs = $plugin['prefs'];
$old_prefs = $plugin['old'];
$config = $this->rc->config;
$defaults = $config->all();
// merge (partial) prefs array with existing settings
$this->prefs = $save_prefs = $a_user_prefs + $old_prefs;
unset($save_prefs['language']);
// don't save prefs with default values if they haven't been changed yet
// Warning: we use result of rcube_config::all() here instead of just get() (#5782)
foreach ($a_user_prefs as $key => $value) {
if ($value === null || (!isset($old_prefs[$key]) && ($value == $config->get($key)))) {
if ($value === null || (!isset($old_prefs[$key]) && $value === $defaults[$key])) {
unset($save_prefs[$key]);
}
}

Loading…
Cancel
Save