From cbd625bb31ff6db5c226c68bcc166ff8d5500f27 Mon Sep 17 00:00:00 2001 From: thomasb 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/rcmail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roundcubemail/program/include/rcmail.php') diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php index 68ab5004c..5d20989b2 100644 --- a/roundcubemail/program/include/rcmail.php +++ b/roundcubemail/program/include/rcmail.php @@ -178,7 +178,7 @@ class rcmail $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'])); -- cgit v1.2.3