From f092bde10e861befa7ad6a27a424609121b4dd1d Mon Sep 17 00:00:00 2001
From: thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Tue, 16 Sep 2008 08:59:48 +0000
Subject: Always return language prop even if no other prefs are saved

git-svn-id: https://svn.roundcube.net/trunk@1802 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_user.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'roundcubemail/program/include')

diff --git a/roundcubemail/program/include/rcube_user.php b/roundcubemail/program/include/rcube_user.php
index a5dc73bca..cc09028f1 100644
--- a/roundcubemail/program/include/rcube_user.php
+++ b/roundcubemail/program/include/rcube_user.php
@@ -78,10 +78,12 @@ class rcube_user
    */
   function get_prefs()
   {
+    $prefs = array('language' => $this->language);
+    
     if ($this->ID && $this->data['preferences'])
-      return array('language' => $this->language) + unserialize($this->data['preferences']);
-    else
-      return array();
+      $prefs += (array)unserialize($this->data['preferences']);
+    
+    return $prefs;
   }
   
   
-- 
cgit v1.2.3