Changeset e62346c in github

Timestamp:

Feb 25, 2010 7:43:21 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

82c98e6

Parents:

64608bf

Message:

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

Location:

program/lib/Mail

Files:

• mime.php (modified) (4 diffs)
• mimePart.php (modified) (1 diff)

program/lib/Mail/mime.php

@@ -112 +112 @@
 
     /**
-     * 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
      *
@@ -1038 +1022 @@
      * @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
      * 
@@ -1084 +1068 @@
      *
      * @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
@@ -1255 +1239 @@
             'resent-from', 'resent-to', 'resent-cc', 'resent-bcc',
             'resent-sender', 'resent-reply-to',
+            'return-receipt-to', 'disposition-notification-to',
         );
         $other_headers = array(

program/lib/Mail/mimePart.php

@@ -437 +437 @@
      * @access public
      */
-    function &addSubPart($body, $params)
+    function &addSubpart($body, $params)
     {
         $this->_subparts[] = new Mail_mimePart($body, $params);