From a712429edcd201341483cc3a85364bd6540769be Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 24 Mar 2011 13:41:25 +0300
Subject: [PATCH] improve favicon detection (refs #322)

---
 functions.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/functions.php b/functions.php
index 01500f3cf..0dd7ca47b 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");