diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-11-25 16:17:50 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-11-25 16:17:50 +0100 |
| commit | 24702133132d7c4f49a9643798cce14466d73b2a (patch) | |
| tree | 97b809eb6fc5ec3489fa0d89fcf60ba53b8de703 /program/steps/mail/func.inc | |
| parent | f690cf1eb6bd16bb411da493cdc43801833e4294 (diff) | |
| parent | 5352b55779aadc8b4c665daf69c7a27767f17d78 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/steps/mail/func.inc')
| -rw-r--r-- | program/steps/mail/func.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 9864ca7a0..33ac1a206 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1061,10 +1061,10 @@ function rcmail_localized_priority($value) '4' => 'low', '5' => 'lowest', ); - + if ($value && $labels_map[$value]) return rcube_label($labels_map[$value]); - + return ''; } @@ -1488,7 +1488,9 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null, $mailto = rcube_idn_to_utf8($mailto); if ($PRINT_MODE) { - $out .= sprintf('%s <%s>', Q($name), $mailto); + $out .= ($out ? ', ' : '') . sprintf('%s <%s>', Q($name), $mailto); + // for printing we display all addresses + continue; } else if (check_email($part['mailto'], false)) { if ($linked) { |