diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-04-23 18:00:48 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-04-23 18:00:48 +0200 |
| commit | 2ffb00c37fd0299ad7f13137115091fd62582ac6 (patch) | |
| tree | 92fbc3445c86f5083f118cf3c60b3606e92cd433 /lib/favicons.php | |
| parent | b95a2c192e1879f7353659728c6bd25304230086 (diff) | |
Better handling of protocol-relative favicons
https://github.com/ArthurHoaro/favicon/pull/6/commits/cd5f98ecdd1d38e8bc5d87fd09c80079a74191ba
https://github.com/FreshRSS/FreshRSS/pull/1504
Diffstat (limited to 'lib/favicons.php')
| -rw-r--r-- | lib/favicons.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/favicons.php b/lib/favicons.php index de993ec8a..62a21a246 100644 --- 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); |