valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.tt-rss.org:git/tt-rss into pdo-experimental

This commit is contained in:
Andrew Dolgov 2017-12-13 08:21:50 +03:00
parent e2cb5e6cb9 d23e4b43b0
commit f830f853a9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/af_readability/init.php
View File

@ -155,6 +155,8 @@ class Af_Readability extends Plugin {
if (strpos($content_type, "text/html") === FALSE) if (strpos($content_type, "text/html") === FALSE)
return false; return false;
$effective_url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
} }
$tmp = fetch_file_contents($url); $tmp = fetch_file_contents($url);
@ -165,6 +167,9 @@ class Af_Readability extends Plugin {
if (!$tmpdoc->loadHTML('<?xml encoding="utf-8" ?>\n' . $tmp)) if (!$tmpdoc->loadHTML('<?xml encoding="utf-8" ?>\n' . $tmp))
return false; return false;
if (!isset($effective_url))
$effective_url = $url;
if (strtolower($tmpdoc->encoding) != 'utf-8') { if (strtolower($tmpdoc->encoding) != 'utf-8') {
$tmpxpath = new DOMXPath($tmpdoc); $tmpxpath = new DOMXPath($tmpdoc);
@ -185,13 +190,13 @@ class Af_Readability extends Plugin {
foreach ($entries as $entry) { foreach ($entries as $entry) {
if ($entry->hasAttribute("href")) { if ($entry->hasAttribute("href")) {
$entry->setAttribute("href", $entry->setAttribute("href",
rewrite_relative_url($url, $entry->getAttribute("href"))); rewrite_relative_url($effective_url, $entry->getAttribute("href")));
} }
if ($entry->hasAttribute("src")) { if ($entry->hasAttribute("src")) {
$entry->setAttribute("src", $entry->setAttribute("src",
rewrite_relative_url($url, $entry->getAttribute("src"))); rewrite_relative_url($effective_url, $entry->getAttribute("src")));
} }