Fix regression where groups with email address were resolved to its members' addresses

pull/83/merge
Aleksander Machniak 8 years ago
parent 81f67a4de2
commit 61bec3efa4

@ -11,6 +11,7 @@ CHANGELOG Roundcube Webmail
- Fix bug where mail content frame couldn't be reset in some corner cases (#5608) - 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 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 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.3-beta RELEASE 1.3-beta
---------------- ----------------

@ -104,6 +104,11 @@ if (!empty($book_types) && strlen($search)) {
$contact['display'] = $display; $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; $contacts[$index] = $contact;
$sort_keys[$index] = sprintf('%s %03d', $contact['display'] ?: $name, $idx++); $sort_keys[$index] = sprintf('%s %03d', $contact['display'] ?: $name, $idx++);

Loading…
Cancel
Save