From 83f1f6b12fb5405ca598322e09b3ccd0842ccc85 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 25 Feb 2015 09:24:14 -0500
Subject: [PATCH] Improve compose_search_name() to not return "email@address <email@address>" entries which may happen for contacts without name(s)
---
program/lib/Roundcube/rcube_addressbook.php | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php
index 69f8bf9..31189e0 100644
--- a/program/lib/Roundcube/rcube_addressbook.php
+++ b/program/lib/Roundcube/rcube_addressbook.php
@@ -594,6 +594,13 @@
switch ($key) {
case 'name':
$value = $name ?: self::compose_list_name($contact);
+
+ // If name(s) are undefined compose_list_name() may return an email address
+ // here we prevent from returning the same name and email
+ if ($name === $email && strpos($result, '{email}') !== false) {
+ $value = '';
+ }
+
break;
case 'email':
--
Gitblit v1.9.1