summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/libraries/Email.php2
-rw-r--r--user_guide/changelog.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 6ced2c5c8..ee3d76367 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -1196,7 +1196,7 @@ class CI_Email {
// Convert spaces and tabs but only if it's the end of the line
if ($i == ($length - 1))
{
- $char = ($ascii == '32' OR $ascii == '9') ? $escape.sprintf('%02s', dechex($char)) : $char;
+ $char = ($ascii == '32' OR $ascii == '9') ? $escape.sprintf('%02s', dechex($ascii)) : $char;
}
// encode = signs
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 3aaf7292d..e0e2bef36 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -82,6 +82,7 @@ SVN Revision: XXXX</p>
<li>Fixed bug in xss_clean() that could remove some desirable tag attributes.</li>
<li>Fixed assorted user guide typos or examples (#4840, #4862, #4864, #4899, #4930).</li>
<li>Fixed an edit from 1.6.3 that made the $robots array in user_agents.php go poof.</li>
+ <li>Fixed a bug in the Email library with quoted-printable encoding improperly encoding space and tab characters.</li>
</ul>
<h2>Version 1.6.3</h2>