summaryrefslogtreecommitdiff
path: root/program/steps/mail
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/steps/mail
parent533e8602c0be3aed7becc74002c58a7d1cf400c3 (diff)
Change rcube_user::list_identities() to return an array instead of a sql-result
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/compose.inc6
1 files changed, 3 insertions, 3 deletions
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);