From 224278cc4dd0c53f8da4379305b0fe2458633e1b Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sat, 5 Jul 2014 13:41:21 +0200 Subject: Fix bug where contacts with no email address were listed on compose addressbook (#1489970) --- CHANGELOG | 1 + program/lib/Roundcube/rcube_contacts.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 1b469c374..ab0b98279 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,7 @@ CHANGELOG Roundcube Webmail - Fix incorrect label translation in return receipt (#1489963) - Fix security issue in delete-response action - allow only ajax request - Fix Delete button state after deleting identity/response (#1489972) +- Fix bug where contacts with no email address were listed on compose addressbook (#1489970) RELEASE 1.0.1 ------------- diff --git a/program/lib/Roundcube/rcube_contacts.php b/program/lib/Roundcube/rcube_contacts.php index d215760cf..5e1a40e5b 100644 --- a/program/lib/Roundcube/rcube_contacts.php +++ b/program/lib/Roundcube/rcube_contacts.php @@ -264,7 +264,7 @@ class rcube_contacts extends rcube_addressbook if ($read_vcard) $sql_arr = $this->convert_db_data($sql_arr); else { - $sql_arr['email'] = explode(self::SEPARATOR, $sql_arr['email']); + $sql_arr['email'] = $sql_arr['email'] ? explode(self::SEPARATOR, $sql_arr['email']) : array(); $sql_arr['email'] = array_map('trim', $sql_arr['email']); } -- cgit v1.2.3