From d75ef7ef08d2cebd3bea476c086fc1b715006cd7 Mon Sep 17 00:00:00 2001 From: thomasb Date: Tue, 9 Jun 2009 08:18:06 +0000 Subject: Change rcube_user::list_identities() to return an array instead of a sql-result git-svn-id: https://svn.roundcube.net/trunk@2627 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_user.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'roundcubemail/program/include') diff --git a/roundcubemail/program/include/rcube_user.php b/roundcubemail/program/include/rcube_user.php index 281328a8e..fb44cb0e0 100644 --- a/roundcubemail/program/include/rcube_user.php +++ b/roundcubemail/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; } -- cgit v1.2.3