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/rcmail.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 68ab500..5d20989 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -178,7 +178,7 @@
$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']));
--
Gitblit v1.9.1