From ed205f41836e4b3735c0a5a2da61cd8304bdbad0 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 09 Jun 2009 04:18:06 -0400
Subject: [PATCH] Change rcube_user::list_identities() to return an array instead of a sql-result
---
program/steps/mail/compose.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index f753b35..8d541da 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -278,9 +278,9 @@
}
// 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 @@
$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);
--
Gitblit v1.9.1