From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 24 Mar 2011 10:41:25 +0000 (+0300)
Subject: improve favicon detection (refs #322)
X-Git-Tag: 1.5.3~114
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a712429edcd201341483cc3a85364bd6540769be;p=tt-rss.git

improve favicon detection (refs #322)
---

diff --git a/functions.php b/functions.php
index 01500f3c..0dd7ca47 100644
--- a/functions.php
+++ b/functions.php
@@ -427,8 +427,14 @@
 			$doc = new DOMDocument();
 			$doc->loadHTML($html);
 			$xpath = new DOMXPath($doc);
-			$entries = $xpath->query('/html/head/link[@rel="shortcut icon"]');
 
+			$base = $xpath->query('/html/head/base');
+			foreach ($base as $b) {
+				$url = $b->getAttribute("href");
+				break;
+			}
+
+			$entries = $xpath->query('/html/head/link[@rel="shortcut icon" or @rel="icon"]');
 			if (count($entries) > 0) {
 				foreach ($entries as $entry) {
 					$favicon_url = rewrite_relative_url($url, $entry->getAttribute("href"));
@@ -452,7 +458,6 @@
 
 		if ($favicon_url && !file_exists($icon_file)) {
 			$contents = fetch_file_contents($favicon_url, "image");
-
 			if ($contents) {
 				$fp = fopen($icon_file, "w");