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/rcube_user.php b/roundcubemail/program/include/rcube_user.php
index 54987098e..41a8bb531 100644
--- a/roundcubemail/program/include/rcube_user.php
+++ b/roundcubemail/program/include/rcube_user.php
@@ -123,7 +123,7 @@ class rcube_user
 
     $this->language = $_SESSION['language'];
     if ($this->db->affected_rows()) {
-      $config->merge($a_user_prefs);
+      $config->set_user_prefs($a_user_prefs);
       return true;
     }