- Fix encoding of Return-Receipt-To and Disposition-Notification-To headers (1486515)

release-0.6
alecpl 15 years ago
parent 64608bf2ef
commit e62346c9ba

@ -110,22 +110,6 @@ class Mail_mime
*/ */
var $_htmlbody; 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 * list of the attached images
* *
@ -1037,7 +1021,7 @@ class Mail_mime
* *
* @param array $xtra_headers Assoc array with any extra headers (optional) * @param array $xtra_headers Assoc array with any extra headers (optional)
* @param bool $overwrite Overwrite already existing headers. * @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 * Content-Disposition and Content-Transfer-Encoding
* *
* @return array Assoc array with the mime headers * @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) * (usefull if you want to use the PHP mail() function)
* *
* @param array $xtra_headers Assoc array with any extra headers (optional) * @param array $xtra_headers Assoc array with any extra headers (optional)
* @param bool $overwrite Overwrite the existing heaers with new. * @param bool $overwrite Overwrite the existing headers with new.
* @param bool $skip_content Don't return content headers: Content-Type * @param bool $skip_content Don't return content headers: Content-Type,
* and Content-Transfer-Encoding * Content-Disposition and Content-Transfer-Encoding
* *
* @return string Plain text headers * @return string Plain text headers
* @access public * @access public
@ -1254,6 +1238,7 @@ class Mail_mime
'from', 'to', 'cc', 'bcc', 'sender', 'reply-to', 'from', 'to', 'cc', 'bcc', 'sender', 'reply-to',
'resent-from', 'resent-to', 'resent-cc', 'resent-bcc', 'resent-from', 'resent-to', 'resent-cc', 'resent-bcc',
'resent-sender', 'resent-reply-to', 'resent-sender', 'resent-reply-to',
'return-receipt-to', 'disposition-notification-to',
); );
$other_headers = array( $other_headers = array(
'references', 'in-reply-to', 'message-id', 'resent-message-id', 'references', 'in-reply-to', 'message-id', 'resent-message-id',

@ -436,7 +436,7 @@ class Mail_mimePart
* otherwise you will not be able to add further subparts. * otherwise you will not be able to add further subparts.
* @access public * @access public
*/ */
function &addSubPart($body, $params) function &addSubpart($body, $params)
{ {
$this->_subparts[] = new Mail_mimePart($body, $params); $this->_subparts[] = new Mail_mimePart($body, $params);
return $this->_subparts[count($this->_subparts) - 1]; return $this->_subparts[count($this->_subparts) - 1];

Loading…
Cancel
Save