From cbd625bb31ff6db5c226c68bcc166ff8d5500f27 Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 18 Feb 2010 18:01:53 +0000
Subject: 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
---
 roundcubemail/program/include/rcube_user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'roundcubemail/program/include/rcube_user.php')

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;
     }
 
-- 
cgit v1.2.3