diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2013-07-25 22:38:14 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2013-07-25 22:38:31 +0200 |
| commit | ccce3cce3aa6d638f74fe330dfbd29f10ff35334 (patch) | |
| tree | bc2aed1fa0348329241085b3a520b74a38f9a0dc | |
| parent | 08f5bbd26b4af72e107b6c52e5ec57958a1ad2d5 (diff) | |
Fix identity-selection using Return-Path headers (#1489241)
| -rw-r--r-- | program/steps/mail/func.inc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 2a1796c78..16a9f495d 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1803,9 +1803,8 @@ 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) { - $ident = str_replace('@', '=', $ident['email_ascii']) . '@'; foreach ((array)$return_path as $path) { - if (strpos($path, $ident) !== false) { + if (stripos($path, $ident['email_ascii']) !== false) { $from_idx = $idx; break 2; } |