diff options
| author | Andrew Dolgov <[email protected]> | 2019-03-22 14:56:53 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2019-03-22 14:56:53 +0300 |
| commit | 59d0e35b7d9f2e656f33052eca62b5bd7afef591 (patch) | |
| tree | ba089e123bd538b325d670ac31fe65852c0d02b7 /classes | |
| parent | b583ca12fb1f6fdf02a15762ee7036b2ec653c27 (diff) | |
| parent | 671f4cee657f36881eeeea7e5d314034252e3ee7 (diff) | |
Merge branch 'master' of git.fakecake.org:tt-rss
Diffstat (limited to 'classes')
| -rwxr-xr-x | classes/article.php | 14 | ||||
| -rwxr-xr-x | classes/handler/public.php | 2 | ||||
| -rwxr-xr-x | classes/rpc.php | 2 | ||||
| -rwxr-xr-x | classes/rssutils.php | 6 |
4 files changed, 10 insertions, 14 deletions
diff --git a/classes/article.php b/classes/article.php index 028901368..ff83143d6 100755 --- a/classes/article.php +++ b/classes/article.php @@ -697,17 +697,17 @@ class Article extends Handler_Protected { $ids_qmarks = arr_qmarks($ids); - if ($cmode == 0) { + if ($cmode == 1) { $sth = $pdo->prepare("UPDATE ttrss_user_entries SET - unread = false,last_read = NOW() - WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?"); - } else if ($cmode == 1) { + unread = true + WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?"); + } else if ($cmode == 2) { $sth = $pdo->prepare("UPDATE ttrss_user_entries SET - unread = true - WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?"); + unread = NOT unread,last_read = NOW() + WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?"); } else { $sth = $pdo->prepare("UPDATE ttrss_user_entries SET - unread = NOT unread,last_read = NOW() + unread = false,last_read = NOW() WHERE ref_id IN ($ids_qmarks) AND owner_uid = ?"); } diff --git a/classes/handler/public.php b/classes/handler/public.php index f73427cbf..318cecd72 100755 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -329,7 +329,7 @@ class Handler_Public extends Handler { if (!$og_image) { $tmpdoc = new DOMDocument(); - if (@$tmpdoc->loadHTML(mb_substr($content, 0, 131070))) { + if (@$tmpdoc->loadHTML('<?xml encoding="UTF-8">' . mb_substr($content, 0, 131070))) { $tmpxpath = new DOMXPath($tmpdoc); $imgs = $tmpxpath->query("//img"); diff --git a/classes/rpc.php b/classes/rpc.php index 037e14132..725ca9622 100755 --- a/classes/rpc.php +++ b/classes/rpc.php @@ -287,7 +287,7 @@ class RPC extends Handler_Protected { /* GET["cmode"] = 0 - mark as read, 1 - as unread, 2 - toggle */ function catchupSelected() { $ids = explode(",", clean($_REQUEST["ids"])); - $cmode = sprintf("%d", clean($_REQUEST["cmode"])); + $cmode = (int)clean($_REQUEST["cmode"]); Article::catchupArticlesById($ids, $cmode); diff --git a/classes/rssutils.php b/classes/rssutils.php index 82a6963e8..5aff2f8a3 100755 --- a/classes/rssutils.php +++ b/classes/rssutils.php @@ -1200,12 +1200,8 @@ class RSSUtils { static function cache_media($html, $site_url) { libxml_use_internal_errors(true); - $charset_hack = '<head> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - </head>'; - $doc = new DOMDocument(); - $doc->loadHTML($charset_hack . $html); + $doc->loadHTML('<?xml encoding="UTF-8">' . $html); $xpath = new DOMXPath($doc); $entries = $xpath->query('(//img[@src])|(//video/source[@src])|(//audio/source[@src])'); |