diff options
| author | alecpl <alec@alec.pl> | 2011-11-15 11:22:40 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-11-15 11:22:40 +0000 |
| commit | 5aeeebad5649953abf0c691add15e997a1170a13 (patch) | |
| tree | fefa1969a3c9c499b3470e4202731bb693fa9d91 /program/steps | |
| parent | 305b366bb0cc425e7feb817aca342b95fb17a716 (diff) | |
- Fix regression in setting recipient to self when replying to a Sent message (#1487074)
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/compose.inc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index c527ce15f..9df25f031 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -358,11 +358,13 @@ foreach ($parts as $header) { $mailfollowup = $MESSAGE->headers->others['mail-followup-to']; $mailreplyto = $MESSAGE->headers->others['mail-reply-to']; + // Reply to mailing list... if ($MESSAGE->reply_all == 'list' && $mailfollowup) $fvalue = $mailfollowup; else if ($MESSAGE->reply_all == 'list' && preg_match('/<mailto:([^>]+)>/i', $MESSAGE->headers->others['list-post'], $m)) $fvalue = $m[1]; + // Reply to... else if ($MESSAGE->reply_all && $mailfollowup) $fvalue = $mailfollowup; else if ($mailreplyto) @@ -371,6 +373,11 @@ foreach ($parts as $header) { $fvalue = $MESSAGE->headers->replyto; else if (!empty($MESSAGE->headers->from)) $fvalue = $MESSAGE->headers->from; + + // Reply to message sent by yourself (#1487074) + if (!empty($ident) && $fvalue == $ident['ident']) { + $fvalue = $MESSAGE->headers->to; + } } // add recipient of original message if reply to all else if ($header == 'cc' && !empty($MESSAGE->reply_all) && $MESSAGE->reply_all != 'list') { |