diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-11-25 11:14:13 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-11-25 11:17:38 +0100 |
| commit | c516e3a701b73c67501d94902ecff40970a008db (patch) | |
| tree | 671c32c58306b674bfb73e0aa64f790820dc4957 /program/steps/mail/func.inc | |
| parent | bc4a6a27118535bc6a2ef3d78a29ee485d32bad0 (diff) | |
Fix redundant colon after last address in print mode
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 9b5b4f9d6..5fa5ad6e4 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1050,10 +1050,10 @@ function rcmail_localized_priority($value) '4' => 'low', '5' => 'lowest', ); - + if ($value && $labels_map[$value]) return rcube_label($labels_map[$value]); - + return ''; } @@ -1392,7 +1392,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) { |