diff options
| -rw-r--r-- | program/include/main.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index 06cf706ea..0843f43ce 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -381,7 +381,7 @@ function get_sequence_name($sequence) if (strlen($CONFIG[$config_key])) return $CONFIG[$config_key]; - return $table; + return $sequence; } diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index f14c532b4..b1ce4bd4e 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1435,6 +1435,8 @@ function rcmail_deliver_message(&$message, $from, $mailto) $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str, "-f$from"); } + if ($sent) // remove MDN headers after sending + unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']); $message->_headers = array(); $message->headers($headers); |