Keep unknown/plugin config options; only skip officially obsoleted ones

pull/90/merge
Thomas Bruederli 11 years ago
parent a7fa90f3d3
commit 68eb1835e8

@ -34,7 +34,7 @@ class rcube_install
var $bool_config_props = array();
var $local_config = array('db_dsnw', 'default_host', 'support_url', 'des_key', 'plugins');
var $obsolete_config = array('db_backend', 'double_auth');
var $obsolete_config = array('db_backend', 'db_max_length', 'double_auth');
var $replaced_config = array(
'skin_path' => 'skin',
'locale_string' => 'language',
@ -44,6 +44,8 @@ class rcube_install
'pagesize' => 'mail_pagesize',
'default_imap_folders' => 'default_folders',
'top_posting' => 'reply_mode',
'keep_alive' => 'refresh_interval',
'min_keep_alive' => 'min_refresh_interval',
);
// list of supported database drivers
@ -247,7 +249,9 @@ class rcube_install
}
// skip this property
if ((!array_key_exists($prop, $this->defaults) || ($value == $this->defaults[$prop])) && !in_array($prop, $this->local_config)) {
if (($value == $this->defaults[$prop]) && !in_array($prop, $this->local_config)
|| in_array($prop, array_merge($this->obsolete_config, array_keys($this->replaced_config)))
|| preg_match('/^db_(table|sequence)_/', $prop)) {
continue;
}

Loading…
Cancel
Save