Fix bcit-ci#4192

narfbg · narfbg · commit 3368cebeb668 · 2015-10-30T12:25:15.000+02:00
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
@@ -1563,11 +1563,10 @@ protected function _prep_q_encoding($str)
 
 		if ($this->charset === 'UTF-8')
 		{
-			if (MB_ENABLED === TRUE)
-			{
-				return mb_encode_mimeheader($str, $this->charset, 'Q', $this->crlf);
-			}
-			elseif (ICONV_ENABLED === TRUE)
+			// Note: We used to have mb_encode_mimeheader() as the first choice
+			//       here, but it turned out to be buggy and unreliable. DO NOT
+			//       re-add it! -- Narf
+			if (ICONV_ENABLED === TRUE)
 			{
 				$output = @iconv_mime_encode('', $str,
 					array(
@@ -1590,6 +1589,10 @@ protected function _prep_q_encoding($str)
 
 				$chars = iconv_strlen($str, 'UTF-8');
 			}
+			elseif (MB_ENABLED === TRUE)
+			{
+				$chars = mb_strlen($str, 'UTF-8');
+			}
 		}
 
 		// We might already have this set for UTF-8
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
@@ -22,6 +22,7 @@ Bug fixes for 3.0.3
 -  Fixed a bug where :doc:`Database Transaction <database/transactions>` methods ``trans_begin()``, ``trans_commit()``, ``trans_rollback()`` ignored failures.
 -  Fixed a bug where all :doc:`Database Transaction <database/transactions>` methods returned TRUE while transactions are actually disabled.
 -  Fixed a bug where :doc:`common function <general/common_functions>` :php:func:`html_escape()` modified keys of its array inputs.
+-  Fixed a bug (#4192) - :doc:`Email Library <libraries/email>` wouldn't always have proper Quoted-printable encoding due to a bug in PHP's own ``mb_mime_encodeheader()`` function.
 
 Version 3.0.2
 =============

Original file line number	Diff line number	Diff line change
`@@ -1563,11 +1563,10 @@ protected function _prep_q_encoding($str)`
`1563`	`1563`
`1564`	`1564`	`if ($this->charset === 'UTF-8')`
`1565`	`1565`	`{`
`1566`		`- if (MB_ENABLED === TRUE)`
`1567`		`- {`
`1568`		`- return mb_encode_mimeheader($str, $this->charset, 'Q', $this->crlf);`
`1569`		`- }`
`1570`		`- elseif (ICONV_ENABLED === TRUE)`
	`1566`	`+ // Note: We used to have mb_encode_mimeheader() as the first choice`
	`1567`	`+ // here, but it turned out to be buggy and unreliable. DO NOT`
	`1568`	`+ // re-add it! -- Narf`
	`1569`	`+ if (ICONV_ENABLED === TRUE)`
`1571`	`1570`	`{`
`1572`	`1571`	`$output = @iconv_mime_encode('', $str,`
`1573`	`1572`	`array(`
`@@ -1590,6 +1589,10 @@ protected function _prep_q_encoding($str)`
`1590`	`1589`
`1591`	`1590`	`$chars = iconv_strlen($str, 'UTF-8');`
`1592`	`1591`	`}`
	`1592`	`+ elseif (MB_ENABLED === TRUE)`
	`1593`	`+ {`
	`1594`	`+ $chars = mb_strlen($str, 'UTF-8');`
	`1595`	`+ }`
`1593`	`1596`	`}`
`1594`	`1597`
`1595`	`1598`	`// We might already have this set for UTF-8`