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

1 files changed, 5 insertions, 3 deletions

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;
   }