Better handling of protocol-relative favicons

cd5f98ecdd https://github.com/FreshRSS/FreshRSS/pull/1504
8 years ago · 2ffb00c37f
parent b95a2c192e
commit 2ffb00c37f
1 changed files with 6 additions and 1 deletions
--- a/lib/favicons.php
+++ b/lib/favicons.php
@ -61,7 +61,12 @@ function searchFavicon(&$url) {
 					strtolower(trim($link->getAttribute('rel'))) === $rel) {
 					$href = trim($link->getAttribute('href'));
 					if (substr($href, 0, 2) === '//') {
-						$href = 'https:' . $href;
+						// Case of protocol-relative URLs
+						if (preg_match('%^(https?:)//%i', $url, $matches)) {
+							$href = $matches[1] . $href;
+						} else {
+							$href = 'https:' . $href;
+						}
 					}
 					if (filter_var($href, FILTER_VALIDATE_URL) === false) {
 						$href = SimplePie_IRI::absolutize($url, $href);