From 3ee48ac83061ad205f42547f0f476db7a5243120 Mon Sep 17 00:00:00 2001 From: JustAMacUser Date: Wed, 13 Dec 2017 00:17:43 -0500 Subject: [PATCH] Make af_readability use resolved URL when rewriting relative URLs in the article. --- plugins/af_readability/init.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/af_readability/init.php b/plugins/af_readability/init.php index 192ad90b6..fbc8fe0ab 100755 --- a/plugins/af_readability/init.php +++ b/plugins/af_readability/init.php @@ -154,6 +154,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); @@ -164,6 +166,9 @@ class Af_Readability extends Plugin { if (!$tmpdoc->loadHTML('\n' . $tmp)) return false; + if (!isset($effective_url)) + $effective_url = $url; + if (strtolower($tmpdoc->encoding) != 'utf-8') { $tmpxpath = new DOMXPath($tmpdoc); @@ -184,13 +189,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"))); }