From 155329b71cf5a15eae4e1d14dbf7e7bdca5c29cc Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 16 Sep 2008 04:59:48 -0400
Subject: [PATCH] Always return language prop even if no other prefs are saved
---
program/include/rcube_user.php | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index a5dc73b..cc09028 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -78,10 +78,12 @@
*/
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;
}
--
Gitblit v1.9.1