summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-09-26 15:52:06 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-09-26 15:52:06 +0000
commit61ad98aa9dcdaa01665ef8a88a2ef4e214493dd2 (patch)
tree5b96ce79a1ebb37af8c2ca4d16fdf613c1fccdb5 /roundcubemail/program/include
parent34226e4c3859c3535fcd7301e8adaa6950515e7b (diff)
Allow to save particular user prefs
git-svn-id: https://svn.roundcube.net/trunk@827 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include')
-rw-r--r--roundcubemail/program/include/main.inc3
1 files changed, 3 insertions, 0 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index ee6d19ba8..9809865d4 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -843,6 +843,9 @@ function rcmail_save_user_prefs($a_user_prefs)
{
global $DB, $CONFIG, $sess_user_lang;
+ // merge (partial) prefs array with existing settings
+ $a_user_prefs += (array)$_SESSION['user_prefs'];
+
$DB->query("UPDATE ".get_table_name('users')."
SET preferences=?,
language=?