Merge pull request #6 from FreshRSS/protocol-relative

Add compatibility with protocol relative URLs
ArthurHoaro · Apr 23, 2017 · 02163a1 · 02163a1
2 parents d74265d + cd5f98e
commit 02163a1
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Favicon/Favicon.php b/src/Favicon/Favicon.php
@@ -191,7 +191,15 @@ private function getFavicon($url, $checkDefault = true) {
 
         // See if it's specified in a link tag in domain url.
         if (!$favicon) {
-            $favicon = $this->getInPage($url);
+            $favicon = trim($this->getInPage($url));
+        }
+        // Case of protocol-relative URLs
+        if (substr($favicon, 0, 2) === '//') {
+            if (preg_match('%^(https?:)//%i', $url, $matches)) {
+                $favicon = $matches[1] . $favicon;
+            } else {
+                $favicon = 'https:' . $favicon;
+            }
         }
 
         // Make sure the favicon is an absolute URL.