From f51a101891cf6c7c2ebea7e61261b41dd6332834 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 7 Feb 2017 09:56:34 +0100 Subject: [PATCH] Fix regression where groups with email address were resolved to its members' addresses --- CHANGELOG | 1 + program/steps/mail/autocomplete.inc | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e1afff8be..e4a02f10c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ CHANGELOG Roundcube Webmail - Fix bug where mail content frame couldn't be reset in some corner cases (#5608) - Fix bug where some classic skin images were not displayed in IE/Edge (#5614) - Fix bug where signature couldn't be added above the quote in Firefox 51 (#5628) +- Fix regression where groups with email address were resolved to its members' addresses RELEASE 1.2.3 ------------- diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc index dd82e8a75..490103b45 100644 --- a/program/steps/mail/autocomplete.inc +++ b/program/steps/mail/autocomplete.inc @@ -99,6 +99,11 @@ if (!empty($book_types) && strlen($search)) { $contact['display'] = $display; } + // groups with defined email address will not be expanded to its members' addresses + if ($sql_arr['_type'] == 'group') { + $contact['email'] = $email; + } + $contacts[$index] = $contact; $sort_keys[$index] = sprintf('%s %03d', $contact['display'] ?: $name, $idx++);