diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2009-02-10 19:33:01 +0100 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2009-02-10 19:33:01 +0100 |
| commit | a45e761adedf682aed63aba88730f4929eefc159 (patch) | |
| tree | 239c14780effcff998b8b85a47de6294780dda3f | |
| parent | 5f386a3c791fdb97bd403c4469b79578ae0af702 (diff) | |
added an additional newline for MUAs that require a double line break between multipart headers and the ignored MIME message area
http://codeigniter.com/bug_tracker/bug/6681/
| -rw-r--r-- | system/libraries/Email.php | 6 | ||||
| -rw-r--r-- | user_guide/changelog.html | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php index 99a5ea385..7539fe54a 100644 --- a/system/libraries/Email.php +++ b/system/libraries/Email.php @@ -1010,7 +1010,7 @@ class CI_Email { } else { - $hdr .= "Content-Type: multipart/alternative; boundary=\"" . $this->_alt_boundary . "\"" . $this->newline; + $hdr .= "Content-Type: multipart/alternative; boundary=\"" . $this->_alt_boundary . "\"" . $this->newline . $this->newline; $hdr .= $this->_get_mime_message() . $this->newline . $this->newline; $hdr .= "--" . $this->_alt_boundary . $this->newline; @@ -1051,7 +1051,7 @@ class CI_Email { break; case 'plain-attach' : - $hdr .= "Content-Type: multipart/".$this->multipart."; boundary=\"" . $this->_atc_boundary."\"" . $this->newline; + $hdr .= "Content-Type: multipart/".$this->multipart."; boundary=\"" . $this->_atc_boundary."\"" . $this->newline . $this->newline; $hdr .= $this->_get_mime_message() . $this->newline . $this->newline; $hdr .= "--" . $this->_atc_boundary . $this->newline; @@ -1071,7 +1071,7 @@ class CI_Email { break; case 'html-attach' : - $hdr .= "Content-Type: multipart/".$this->multipart."; boundary=\"" . $this->_atc_boundary."\"" . $this->newline; + $hdr .= "Content-Type: multipart/".$this->multipart."; boundary=\"" . $this->_atc_boundary."\"" . $this->newline . $this->newline; $hdr .= $this->_get_mime_message() . $this->newline . $this->newline; $hdr .= "--" . $this->_atc_boundary . $this->newline; diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 504d2b4bb..1992ebbe2 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -70,6 +70,7 @@ SVN Revision: </p> <li>Added more accurate error reporting for the Email library when using sendmail.</li> <li>Removed a strict type check from the <kbd>rotate()</kbd> function of the <a href="libraries/image_lib.html">Image Manipulation Class</a>.</li> <li>Added enhanced error checking in file saving in the Image library when using the GD lib.</li> + <li>Added an additional newline between multipart email headers and the MIME message text for better compatibility with a variety of MUAs.</li> </ul> </li> <li>Database |