summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-06-06 20:51:59 +0200
committerDerek Jones <derek.jones@ellislab.com>2008-06-06 20:51:59 +0200
commit27a5aa1f5c85fb7e53eda5ab0dd3efcbd70b2338 (patch)
tree9f60e13bb105a0240a5c1790be4dda59b70abbc2
parent57aea15ffffd3c92080380aa188067039c4696b8 (diff)
added quoted-printable headers when $this->send_multipart has been manually changed to FALSE
-rw-r--r--system/libraries/Email.php3
-rw-r--r--user_guide/changelog.html1
2 files changed, 3 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 8eb47dc85..e02c83d19 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -993,7 +993,8 @@ class CI_Email {
if ($this->send_multipart === FALSE)
{
- $hdr .= "Content-Type: text/html;". $this->newline;
+ $hdr .= "Content-Type: text/html; charset=" . $this->charset . $this->newline;
+ $hdr .= "Content-Transfer-Encoding: quoted-printable";
}
else
{
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 110f1c27b..469a95087 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -102,6 +102,7 @@ SVN Revision: not currently released</p>
<li>Removed some unused variables from the code (#4563).</li>
<li>Fixed a bug where <kbd>having()</kbd> was not adding an = into the statement (#4568).</li>
<li>Fixed assorted user guide typos or examples (#4574).</li>
+ <li>Added quoted-printable headers to Email class when the multi-part override is used.</li>
</ul>
<h2>Version 1.6.2</h2>