1
0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 17:15:55 +00:00

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

This commit is contained in:
fox
2019-09-18 15:10:41 +00:00
committed by Gogs

View File

@@ -180,7 +180,11 @@ class Af_Readability extends Plugin {
// this is the worst hack yet :( // this is the worst hack yet :(
if (strtolower($tmpdoc->encoding) != 'utf-8') { if (strtolower($tmpdoc->encoding) != 'utf-8') {
$tmp = preg_replace("/<meta.*?charset.*?\/?>/i", "", $tmp); $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 { try {