summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2009-06-09 08:18:06 +0000
committerthomascube <thomas@roundcube.net>2009-06-09 08:18:06 +0000
commited205f41836e4b3735c0a5a2da61cd8304bdbad0 (patch)
tree7f7422cccd2def8801e26cab25b6e17fe3fd2380 /program/include
parent533e8602c0be3aed7becc74002c58a7d1cf400c3 (diff)
Change rcube_user::list_identities() to return an array instead of a sql-result
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_user.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 281328a8e..fb44cb0e0 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -135,12 +135,12 @@ class rcube_user
* Get default identity of this user
*
* @param int Identity ID. If empty, the default identity is returned
- * @return array Hash array with all cols of the
+ * @return array Hash array with all cols of the identity record
*/
function get_identity($id = null)
{
- $sql_result = $this->list_identities($id ? sprintf('AND identity_id=%d', $id) : '');
- return $this->db->fetch_assoc($sql_result);
+ $result = $this->list_identities($id ? sprintf('AND identity_id=%d', $id) : '');
+ return $result[0];
}
@@ -160,7 +160,12 @@ class rcube_user
ORDER BY ".$this->db->quoteIdentifier('standard')." DESC, name ASC, identity_id ASC",
$this->ID);
- return $sql_result;
+ $result = array();
+ while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+ $result[] = $sql_arr;
+ }
+
+ return $result;
}