diff options
| author | alecpl <alec@alec.pl> | 2010-02-25 12:43:21 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2010-02-25 12:43:21 +0000 |
| commit | e62346c9ba9b27ecf8c7b322ac9d7a4bb25bca48 (patch) | |
| tree | 00571266fbee4ff3fe7b193513af8064f17aae21 /program/lib/Mail/mime.php | |
| parent | 64608bf2ef7fc5b6cedfb666c5f78a5771c58556 (diff) | |
- Fix encoding of Return-Receipt-To and Disposition-Notification-To headers (1486515)
Diffstat (limited to 'program/lib/Mail/mime.php')
| -rw-r--r-- | program/lib/Mail/mime.php | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/program/lib/Mail/mime.php b/program/lib/Mail/mime.php index 81a2569f8..d6d63d68f 100644 --- a/program/lib/Mail/mime.php +++ b/program/lib/Mail/mime.php @@ -111,22 +111,6 @@ class Mail_mime var $_htmlbody; /** - * contains the mime encoded text - * - * @var string - * @access private - */ - var $_mime; - - /** - * contains the multipart content - * - * @var string - * @access private - */ - var $_multipart; - - /** * list of the attached images * * @var array @@ -1037,7 +1021,7 @@ class Mail_mime * * @param array $xtra_headers Assoc array with any extra headers (optional) * @param bool $overwrite Overwrite already existing headers. - * @param bool $skip_content Don't return content headers: Content-Type + * @param bool $skip_content Don't return content headers: Content-Type, * Content-Disposition and Content-Transfer-Encoding * * @return array Assoc array with the mime headers @@ -1083,9 +1067,9 @@ class Mail_mime * (usefull if you want to use the PHP mail() function) * * @param array $xtra_headers Assoc array with any extra headers (optional) - * @param bool $overwrite Overwrite the existing heaers with new. - * @param bool $skip_content Don't return content headers: Content-Type - * and Content-Transfer-Encoding + * @param bool $overwrite Overwrite the existing headers with new. + * @param bool $skip_content Don't return content headers: Content-Type, + * Content-Disposition and Content-Transfer-Encoding * * @return string Plain text headers * @access public @@ -1254,6 +1238,7 @@ class Mail_mime 'from', 'to', 'cc', 'bcc', 'sender', 'reply-to', 'resent-from', 'resent-to', 'resent-cc', 'resent-bcc', 'resent-sender', 'resent-reply-to', + 'return-receipt-to', 'disposition-notification-to', ); $other_headers = array( 'references', 'in-reply-to', 'message-id', 'resent-message-id', |