From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 20 Aug 2006 04:14:56 +0000 (+0000)
Subject: favicon fix
X-Git-Tag: 1.31.0-rc.0~55945
X-Git-Url: http://git.cyclocoop.org/%22%20.%20%20%20%24self2%20.%20%20%20%22&var_mode_affiche=boucle?a=commitdiff_plain;h=2fd2b526339b94d50e2806fc2c92076afb770309;p=lhc%2Fweb%2Fwiklou.git

favicon fix
---

diff --git a/opensearch_desc.php b/opensearch_desc.php
index 6aeacc4b40..491b05a3b5 100644
--- a/opensearch_desc.php
+++ b/opensearch_desc.php
@@ -7,7 +7,13 @@
 require_once( dirname(__FILE__) . '/includes/WebStart.php' );
 $shortName = htmlspecialchars( mb_substr( $wgSitename, 0, 16 ) );
 $siteName = htmlspecialchars( $wgSitename );
-$favicon = htmlspecialchars( $wgFavicon );
+
+if ( !preg_match( '/^https?:/', $wgFavicon ) ) {
+	$favicon = htmlspecialchars( $wgServer . $wgFavicon );
+} else {
+	$favicon = htmlspecialchars( $wgFavicon );
+}
+
 $title = Title::makeTitle( NS_SPECIAL, 'Search' );
 $template = $title->getFullURL( 'search={searchTerms}' );