Merge branch 'master' of https://github.com/ssodk/roundcubemail into ssodk-master

pull/7181/head
Aleksander Machniak 5 years ago
commit 38116c1ae5

@ -17,6 +17,7 @@ CHANGELOG Roundcube Webmail
- Fix regression where "Open in new window" action didn't work (#7155) - Fix regression where "Open in new window" action didn't work (#7155)
- Fix PHP Warning: array_filter() expects parameter 1 to be array, null given in subscriptions_option plugin (#7165) - Fix PHP Warning: array_filter() expects parameter 1 to be array, null given in subscriptions_option plugin (#7165)
- Fix unexpected error message when mail refresh involves folder auto-unsubscribe (#6923) - Fix unexpected error message when mail refresh involves folder auto-unsubscribe (#6923)
- Fix recipient duplicates in print-view when the recipient list has been expanded (#7169)
RELEASE 1.4.2 RELEASE 1.4.2
------------- -------------

@ -1280,6 +1280,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
$j = 0; $j = 0;
$out = ''; $out = '';
$allvalues = array(); $allvalues = array();
$shown_addresses = array();
$show_email = $RCMAIL->config->get('message_show_email'); $show_email = $RCMAIL->config->get('message_show_email');
if ($addicon && !isset($_SESSION['writeable_abook'])) { if ($addicon && !isset($_SESSION['writeable_abook'])) {
@ -1363,6 +1364,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
if (!$moreadrs) { if (!$moreadrs) {
$out .= ($out ? ', ' : '') . $address; $out .= ($out ? ', ' : '') . $address;
$shown_addresses[] = $address;
} }
if ($max && $j == $max && $c > $j) { if ($max && $j == $max && $c > $j) {
@ -1385,7 +1387,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
'class' => 'morelink', 'class' => 'morelink',
'onclick' => '$(this).hide().next().show()', 'onclick' => '$(this).hide().next().show()',
), $label) ), $label)
. html::span(array('style' => 'display:none'), join(', ', $allvalues)); . html::span(array('style' => 'display:none'), join(', ', array_diff($allvalues, $shown_addresses)));
} }
else { else {
$out .= ' ' . html::a(array( $out .= ' ' . html::a(array(

Loading…
Cancel
Save