diff options
author | Benjamin Brahmer <info@b-brahmer.de> | 2021-04-28 21:13:52 +0200 |
---|---|---|
committer | Benjamin Brahmer <info@b-brahmer.de> | 2021-05-02 11:42:28 +0200 |
commit | 1f94371c5aa4c4a2ce171524689f1a2c9b139948 (patch) | |
tree | 740a4f414026a1d28df15d92847489414f4fbdbe | |
parent | d83f968e920f615b55526ec5920c3cc899d4f906 (diff) |
remove path of url before searching for favicon
Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
-rwxr-xr-x | lib/Fetcher/FeedFetcher.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php index c37bc129c..365b86848 100755 --- a/lib/Fetcher/FeedFetcher.php +++ b/lib/Fetcher/FeedFetcher.php @@ -342,15 +342,18 @@ class FeedFetcher implements IFeedFetcher $is_image = substr(mime_content_type($favicon_path), 0, 5) === "image"; + $base_url = new Net_URL2($url); + $base_url->setPath(''); + // check if file is actually an image if (!$is_image) { - return $this->faviconFactory->get($url); + return $this->faviconFactory->get($base_url->getNormalizedURL()); } list($width, $height, $type, $attr) = getimagesize($favicon_path); // check if image is square else fall back to favicon if ($width !== $height) { - return $this->faviconFactory->get($url); + return $this->faviconFactory->get($base_url); } return $favicon; |