From 096c3bca7303e54bc190d7c0d6e86ac190027d98 Mon Sep 17 00:00:00 2001
From: mrnoname1000 <mrnoname1000@riseup.net>
Date: Thu, 18 May 2023 06:50:50 -0500
Subject: [PATCH] [XPathAbstract] Fix relative links in fetched HTML (#3401)

* [core] Make defaultLinkTo compatible with DOMDocument

* [XPathAbstract] Fix relative links in fetched HTML
---
 lib/XPathAbstract.php |  3 +++
 lib/html.php          | 11 +++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/XPathAbstract.php b/lib/XPathAbstract.php
index d957bb63..27d6e1a1 100644
--- a/lib/XPathAbstract.php
+++ b/lib/XPathAbstract.php
@@ -387,6 +387,9 @@ abstract class XPathAbstract extends BridgeAbstract
         libxml_clear_errors();
         libxml_use_internal_errors(false);
 
+        // fix relative links
+        defaultLinkTo($webPageHtml, $this->feedUri);
+
         $xpath = new \DOMXPath($webPageHtml);
 
         $this->feedName = $this->provideFeedTitle($xpath);
diff --git a/lib/html.php b/lib/html.php
index 96870115..2553f3a8 100644
--- a/lib/html.php
+++ b/lib/html.php
@@ -185,14 +185,17 @@ function defaultLinkTo($dom, $url)
         $dom = str_get_html($dom);
     }
 
-    foreach ($dom->find('img') as $image) {
-        $image->src = urljoin($url, $image->src);
+    // Use long method names for compatibility with simple_html_dom and DOMDocument
+
+    foreach ($dom->getElementsByTagName('img') as $image) {
+        $image->setAttribute('src', urljoin($url, $image->getAttribute('src')));
     }
 
-    foreach ($dom->find('a') as $anchor) {
-        $anchor->href = urljoin($url, $anchor->href);
+    foreach ($dom->getElementsByTagName('a') as $anchor) {
+        $anchor->setAttribute('href', urljoin($url, $anchor->getAttribute('href')));
     }
 
+    // Will never be true for DOMDocument
     if ($string_convert) {
         $dom = $dom->outertext;
     }