diff options
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 9 |
2 files changed, 7 insertions, 3 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix PHP warning when responding to a message with many Return-Path headers (#1489136) - Added user preference to open all popups as standard windows - Fix unintentional compose window resize (#1489114) - Fix performance regression in text wrapping function (#1489133) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index ab4b41155..1a687f508 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1786,9 +1786,12 @@ function rcmail_identity_select($MESSAGE, $identities = null, $compose_mode = 'r // Try Return-Path if ($from_idx === null && ($return_path = $MESSAGE->headers->others['return-path'])) { foreach ($identities as $idx => $ident) { - if (strpos($return_path, str_replace('@', '=', $ident['email_ascii']).'@') !== false) { - $from_idx = $idx; - break; + $ident = str_replace('@', '=', $ident['email_ascii']) . '@'; + foreach ((array)$return_path as $path) { + if (strpos($path, $ident) !== false) { + $from_idx = $idx; + break 2; + } } } } |