Merge pull request #334 from barbushin/develop

Fix 'mb_convert_encoding(): Illegal character encoding specified'
barbushin · May 25, 2019 · 07ffd1e · 07ffd1e
2 parents 7fb17e4 + e4d5130
commit 07ffd1e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/PhpImap/Mailbox.php b/src/PhpImap/Mailbox.php
@@ -1008,7 +1008,7 @@ public function parseDateTime($dateHeader) {
 	 * @throws Exception
 	 */
 	public function convertStringEncoding($string, $fromEncoding, $toEncoding) {
-		if(!$string || $fromEncoding == $toEncoding || preg_match("/default/i", $fromEncoding)) {
+		if(preg_match("/default|ascii|windows/i", $fromEncoding) || !$string || $fromEncoding == $toEncoding) {
 			return $string;
 		}
 		if(extension_loaded('mbstring')) {