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

2 files changed, 6 insertions, 21 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',
diff --git a/program/lib/Mail/mimePart.php b/program/lib/Mail/mimePart.php
index ce37deb99..7863028c8 100644
--- a/program/lib/Mail/mimePart.php
+++ b/program/lib/Mail/mimePart.php
@@ -436,7 +436,7 @@ class Mail_mimePart
      *                       otherwise you will not be able to add further subparts.
      * @access public
      */
-    function &addSubPart($body, $params)
+    function &addSubpart($body, $params)
     {
         $this->_subparts[] = new Mail_mimePart($body, $params);
         return $this->_subparts[count($this->_subparts) - 1];