Fix malformed References: header in send/saved mail (#1489891) - update Mail_mime to 1.8.9 version

1 files changed, 13 insertions, 14 deletions

diff --git a/program/lib/Mail/mime.php b/program/lib/Mail/mime.php
index e079af7e9..50297dd3e 100644
--- a/program/lib/Mail/mime.php
+++ b/program/lib/Mail/mime.php
@@ -491,13 +491,13 @@ class Mail_mime
      * returns it during the build process.
      *
      * @param mixed  &$obj The object to add the part to, or
-     *                     null if a new object is to be created.
+     *                     anything else if a new object is to be created.
      * @param string $text The text to add.
      *
      * @return object      The text mimePart object
      * @access private
      */
-    function &_addTextPart(&$obj = null, $text = '')
+    function &_addTextPart(&$obj, $text = '')
     {
         $params['content_type'] = 'text/plain';
         $params['encoding']     = $this->_build_params['text_encoding'];
@@ -518,12 +518,12 @@ class Mail_mime
      * returns it during the build process.
      *
      * @param mixed &$obj The object to add the part to, or
-     *                    null if a new object is to be created.
+     *                    anything else if a new object is to be created.
      *
      * @return object     The html mimePart object
      * @access private
      */
-    function &_addHtmlPart(&$obj = null)
+    function &_addHtmlPart(&$obj)
     {
         $params['content_type'] = 'text/html';
         $params['encoding']     = $this->_build_params['html_encoding'];
@@ -563,12 +563,12 @@ class Mail_mime
      * the build process.
      *
      * @param mixed &$obj The object to add the part to, or
-     *                    null if a new object is to be created.
+     *                    anything else if a new object is to be created.
      *
      * @return object     The multipart/mixed mimePart object
      * @access private
      */
-    function &_addAlternativePart(&$obj = null)
+    function &_addAlternativePart(&$obj)
     {
         $params['content_type'] = 'multipart/alternative';
         $params['eol']          = $this->_build_params['eol'];
@@ -588,12 +588,12 @@ class Mail_mime
      * the build process.
      *
      * @param mixed &$obj The object to add the part to, or
-     *                    null if a new object is to be created
+     *                    anything else if a new object is to be created
      *
      * @return object     The multipart/mixed mimePart object
      * @access private
      */
-    function &_addRelatedPart(&$obj = null)
+    function &_addRelatedPart(&$obj)
     {
         $params['content_type'] = 'multipart/related';
         $params['eol']          = $this->_build_params['eol'];
@@ -878,11 +878,11 @@ class Mail_mime
 
         $this->_checkParams();
 
-        $null        = null;
-        $attachments = count($this->_parts)                 ? true : false;
-        $html_images = count($this->_html_images)           ? true : false;
-        $html        = strlen($this->_htmlbody)             ? true : false;
-        $text        = (!$html && strlen($this->_txtbody))  ? true : false;
+        $null        = -1;
+        $attachments = count($this->_parts) > 0;
+        $html_images = count($this->_html_images) > 0;
+        $html        = strlen($this->_htmlbody) > 0;
+        $text        = !$html && strlen($this->_txtbody);
 
         switch (true) {
         case $text && !$attachments:
@@ -991,7 +991,6 @@ class Mail_mime
                 $this->_addAttachmentPart($message, $this->_parts[$i]);
             }
             break;
-
         }
 
         if (!isset($message)) {