From 3ecba85408ab77b7a9f918a6d4f866b5bb04779e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 3 Feb 2006 04:04:05 +0000 Subject: [PATCH] * (bug 4303) Add $wgFavicon to change the shorticon icon link from the default /favicon.ico or disable it (if set to false) Patch by nekocue --- RELEASE-NOTES | 2 ++ includes/DefaultSettings.php | 1 + includes/Skin.php | 6 +++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index e82a3500bc..9160a62558 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -589,6 +589,8 @@ fully support the editing toolbar, but was found to be too confusing. and seems to work ok with other bits. No longer including the IE workarounds JavaScript for IE 7 and above. * Fix extra namespace for Bulgarian +* (bug 4303) Add $wgFavicon to change the shorticon icon link from + the default /favicon.ico or disable it (if set to false) === Caveats === diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 87dba3befa..36070185e0 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -118,6 +118,7 @@ $wgUploadPath = "{$wgScriptPath}/upload"; $wgUploadDirectory = "{$IP}/upload"; $wgHashedUploadDirectory = true; $wgLogo = "{$wgUploadPath}/wiki.png"; +$wgFavicon = '/favicon.ico'; $wgMathPath = "{$wgUploadPath}/math"; $wgMathDirectory = "{$wgUploadDirectory}/math"; $wgTmpDirectory = "{$wgUploadDirectory}/tmp"; diff --git a/includes/Skin.php b/includes/Skin.php index 09f39e4102..b2e56dfa61 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -156,10 +156,14 @@ class Skin extends Linker { } function initPage( &$out ) { + global $wgFavicon; + $fname = 'Skin::initPage'; wfProfileIn( $fname ); - $out->addLink( array( 'rel' => 'shortcut icon', 'href' => '/favicon.ico' ) ); + if( false !== $wgFavicon ) { + $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) ); + } $this->addMetadataLinks($out); -- 2.20.1