From ed205f41836e4b3735c0a5a2da61cd8304bdbad0 Mon Sep 17 00:00:00 2001 From: thomascube Date: Tue, 9 Jun 2009 08:18:06 +0000 Subject: Change rcube_user::list_identities() to return an array instead of a sql-result --- program/steps/mail/compose.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'program/steps') diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index f753b35dd..8d541da1e 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -278,9 +278,9 @@ function rcmail_compose_header_from($attrib) } // get this user's identities - $sql_result = $USER->list_identities(); + $user_identities = $USER->list_identities(); - if ($DB->num_rows($sql_result)) + if (count($user_identities)) { $from_id = 0; $a_signatures = array(); @@ -288,7 +288,7 @@ function rcmail_compose_header_from($attrib) $field_attrib['onchange'] = JS_OBJECT_NAME.".change_identity(this)"; $select_from = new html_select($field_attrib); - while ($sql_arr = $DB->fetch_assoc($sql_result)) + foreach ($user_identities as $sql_arr) { $identity_id = $sql_arr['identity_id']; $select_from->add(format_email_recipient($sql_arr['email'], $sql_arr['name']), $identity_id); -- cgit v1.2.3