Merge pull request #1505 from Alkarex/protocol-relative-favicon

Better handling of protocol-relative favicons

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);