Merge branch 'master' of trap000d/tt-rss into master

6 years ago · f1df2c505e
parent d2d9bb1fd8 7a4d5cc724
commit f1df2c505e
1 changed files with 5 additions and 1 deletions
--- a/plugins/af_readability/init.php
+++ b/plugins/af_readability/init.php
@ -180,7 +180,11 @@ class Af_Readability extends Plugin {
 			// this is the worst hack yet :(
 			if (strtolower($tmpdoc->encoding) != 'utf-8') {
 				$tmp = preg_replace("/<meta.*?charset.*?\/?>/i", "", $tmp);
-				$tmp = mb_convert_encoding($tmp, 'utf-8', $tmpdoc->encoding);
+				if (empty($tmpdoc->encoding)) {
+					$tmp = mb_convert_encoding($tmp, 'utf-8');
+				} else {
+					$tmp = mb_convert_encoding($tmp, 'utf-8', $tmpdoc->encoding);
+				}
 			}

 			try {