remove path of url before searching for favicon

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
nextcloud · Apr 28, 2021 · 5c7adb1 · 5c7adb1
1 parent 9705e6a
commit 5c7adb1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php
@@ -340,15 +340,18 @@ protected function getFavicon(FeedInterface $feed, string $url)
 
         $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;