diff options
author | Andrew Dolgov <[email protected]> | 2017-12-13 08:21:50 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2017-12-13 08:21:50 +0300 |
commit | f830f853a919c458d06bdc6ce292b8ae73a801f3 (patch) | |
tree | 14e5116afcab4de0077e5d8ce35a675ee3a96cf2 /plugins/af_readability | |
parent | e2cb5e6cb91fbfa9f929b979855364bc8faa71e8 (diff) | |
parent | d23e4b43b0d6474a141fba4f804133edf4e6a37a (diff) |
Merge branch 'master' of git.tt-rss.org:git/tt-rss into pdo-experimental
Diffstat (limited to 'plugins/af_readability')
-rwxr-xr-x | plugins/af_readability/init.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php index 10de118f9..04673000a 100755 --- a/plugins/af_readability/init.php +++ b/plugins/af_readability/init.php @@ -155,6 +155,8 @@ class Af_Readability extends Plugin { if (strpos($content_type, "text/html") === FALSE) return false; + + $effective_url = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL); } $tmp = fetch_file_contents($url); @@ -165,6 +167,9 @@ class Af_Readability extends Plugin { if (!$tmpdoc->loadHTML('<?xml encoding="utf-8" ?>\n' . $tmp)) return false; + if (!isset($effective_url)) + $effective_url = $url; + if (strtolower($tmpdoc->encoding) != 'utf-8') { $tmpxpath = new DOMXPath($tmpdoc); @@ -185,13 +190,13 @@ class Af_Readability extends Plugin { foreach ($entries as $entry) { if ($entry->hasAttribute("href")) { $entry->setAttribute("href", - rewrite_relative_url($url, $entry->getAttribute("href"))); + rewrite_relative_url($effective_url, $entry->getAttribute("href"))); } if ($entry->hasAttribute("src")) { $entry->setAttribute("src", - rewrite_relative_url($url, $entry->getAttribute("src"))); + rewrite_relative_url($effective_url, $entry->getAttribute("src"))); } |