Merged devel-threads branch (r3066:3364) back into trunk

git-svn-id: https://svn.roundcube.net/trunk@3367 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 5 insertions, 2 deletions

diff --git a/roundcubemail/program/include/rcube_user.php b/roundcubemail/program/include/rcube_user.php
index 835ffe955..6ed16dbac 100644
--- a/roundcubemail/program/include/rcube_user.php
+++ b/roundcubemail/program/include/rcube_user.php
@@ -111,19 +111,22 @@ class rcube_user
       if (!isset($old_prefs[$key]) && ($value == $config->get($key)))
         unset($save_prefs[$key]);
     }
-    
+
+    $save_prefs = serialize($save_prefs);
+
     $this->db->query(
       "UPDATE ".get_table_name('users')."
        SET    preferences=?,
               language=?
        WHERE  user_id=?",
-      serialize($save_prefs),
+      $save_prefs,
       $_SESSION['language'],
       $this->ID);
 
     $this->language = $_SESSION['language'];
     if ($this->db->affected_rows()) {
       $config->set_user_prefs($a_user_prefs);
+      $this->data['preferences'] = $save_prefs;
       return true;
     }