From b545d3e8388d18a64d50b6f7879804cf4e7812ca Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Feb 2010 18:01:53 +0000
Subject: Fix loading of plugin configs: user prefs will always survive
 (#1486368)

---
 program/include/rcube_user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 54987098e..41a8bb531 100644
--- a/program/include/rcube_user.php
+++ b/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