From bba657e64ff3334ba2f64e88e977a6dc107d682d Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 19 Sep 2008 14:26:34 -0400
Subject: [PATCH] Made config files location configurable (#1485215)
---
program/include/rcube_user.php | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 1d07085..cc09028 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -59,17 +59,7 @@
}
}
- /**
- * PHP 4 object constructor
- *
- * @see rcube_user::__construct
- */
- function rcube_user($id = null, $sql_arr = null)
- {
- $this->__construct($id, $sql_arr);
- }
-
-
+
/**
* Build a user name string (as e-mail address)
*
@@ -88,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