public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-18 05:41:30 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of git.fakecake.org:tt-rss

Browse Source
This commit is contained in:
Andrew Dolgov
2019-06-10 15:21:11 +03:00
parent 66171b44dc e40c8daf2e
commit fce869314a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/af_readability/init.php
View File

@@ -48,7 +48,7 @@ class Af_Readability extends Plugin {
function hook_prefs_tab($args) { function hook_prefs_tab($args) {
if ($args != "prefFeeds") return; if ($args != "prefFeeds") return;
print "<div dojoType='dijit.layout.AccordionPane' print "<div dojoType='dijit.layout.AccordionPane'
title=\"<i class='material-icons'>extension</i> ".__('Readability settings (af_readability)')."\">"; title=\"<i class='material-icons'>extension</i> ".__('Readability settings (af_readability)')."\">";
if (version_compare(PHP_VERSION, '5.6.0', '<')) { if (version_compare(PHP_VERSION, '5.6.0', '<')) {
@@ -178,7 +178,7 @@ 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); $tmp = mb_convert_encoding($tmp, 'utf-8', $tmpdoc->encoding);
} }