From b545d3e8388d18a64d50b6f7879804cf4e7812ca Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Thu, 18 Feb 2010 13:01:53 -0500 Subject: [PATCH] Fix loading of plugin configs: user prefs will always survive (#1486368) --- program/include/rcube_user.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php index 5498709..41a8bb5 100644 --- a/program/include/rcube_user.php +++ b/program/include/rcube_user.php @@ -123,7 +123,7 @@ $this->language = $_SESSION['language']; if ($this->db->affected_rows()) { - $config->merge($a_user_prefs); + $config->set_user_prefs($a_user_prefs); return true; } -- Gitblit v1.9.1