summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-09-16 08:59:48 +0000
committerthomascube <thomas@roundcube.net>2008-09-16 08:59:48 +0000
commit155329b71cf5a15eae4e1d14dbf7e7bdca5c29cc (patch)
treed3878999eb8739d09694cfaeaeb0dbafa20343ee /program
parentb62b5a03955065199d5039e16d34586c18db5b7a (diff)
Always return language prop even if no other prefs are saved
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_user.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index a5dc73bca..cc09028f1 100644
--- a/program/include/rcube_user.php
+++ b/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;
}