From 59a888481f1b2cd2dd928b1f23a949257be0d947 Mon Sep 17 00:00:00 2001 From: Benjamin Brahmer Date: Sun, 17 Oct 2021 11:33:17 +0200 Subject: make use of base_url to handle relative urls Signed-off-by: Benjamin Brahmer --- lib/Fetcher/FeedFetcher.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php index 9cab0287d..0b6ce63a0 100755 --- a/lib/Fetcher/FeedFetcher.php +++ b/lib/Fetcher/FeedFetcher.php @@ -70,11 +70,6 @@ class FeedFetcher implements IFeedFetcher */ private $logger; - /** - * @var Client - */ - private $client; - public function __construct( FeedIo $fetcher, Favicon $favicon, @@ -82,8 +77,7 @@ class FeedFetcher implements IFeedFetcher IL10N $l10n, ITempManager $ITempManager, Time $time, - LoggerInterface $logger, - Client $client + LoggerInterface $logger ) { $this->reader = $fetcher; $this->faviconFactory = $favicon; @@ -92,7 +86,6 @@ class FeedFetcher implements IFeedFetcher $this->ITempManager = $ITempManager; $this->time = $time; $this->logger = $logger; - $this->client = $client; } @@ -359,7 +352,9 @@ class FeedFetcher implements IFeedFetcher } try { - $response = $this->client->request( + // Base_uri can only be set on creation, will be used when link is relative. + $client = new Client(['base_uri' => $base_url]); + $response = $client->request( 'GET', $favicon, [ -- cgit v1.2.3