diff options
| author | thomascube <thomas@roundcube.net> | 2010-02-18 18:01:53 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2010-02-18 18:01:53 +0000 |
| commit | b545d3e8388d18a64d50b6f7879804cf4e7812ca (patch) | |
| tree | 2f77722307e65126464f77de9cd6e8ec5ed7dbad /program/include/rcmail.php | |
| parent | 030db5b6c0489158b5a4cf1ab6d2542db0519de8 (diff) | |
Fix loading of plugin configs: user prefs will always survive (#1486368)
Diffstat (limited to 'program/include/rcmail.php')
| -rw-r--r-- | program/include/rcmail.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 68ab5004c..5d20989b2 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -178,7 +178,7 @@ class rcmail $GLOBALS['USER'] = $this->user; // overwrite config with user preferences - $this->config->merge((array)$this->user->get_prefs()); + $this->config->set_user_prefs((array)$this->user->get_prefs()); } $_SESSION['language'] = $this->user->language = $this->language_prop($this->config->get('language', $_SESSION['language'])); |