Fix loading of plugin configs: user prefs will always survive (#1486368)

git-svn-id: https://svn.roundcube.net/trunk@3274 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 1 insertions, 1 deletions

diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php
index 68ab5004c..5d20989b2 100644
--- a/roundcubemail/program/include/rcmail.php
+++ b/roundcubemail/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']));