MediaWiki r12942 - Code Review

Index: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php	(revision 12941)
+++ trunk/phase3/includes/DefaultSettings.php	(revision 12942)
@@ -118,6 +118,7 @@
 $wgUploadDirectory	= "{$IP}/upload";
 $wgHashedUploadDirectory	= true;
 $wgLogo				= "{$wgUploadPath}/wiki.png";
+$wgFavicon			= '/favicon.ico';
 $wgMathPath         = "{$wgUploadPath}/math";
 $wgMathDirectory    = "{$wgUploadDirectory}/math";
 $wgTmpDirectory     = "{$wgUploadDirectory}/tmp";
Index: trunk/phase3/includes/Skin.php
===================================================================
--- trunk/phase3/includes/Skin.php	(revision 12941)
+++ trunk/phase3/includes/Skin.php	(revision 12942)
@@ -156,10 +156,14 @@
 	}
 
 	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);
 
Index: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES	(revision 12941)
+++ trunk/phase3/RELEASE-NOTES	(revision 12942)
@@ -589,6 +589,8 @@
   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 ===