Revert r53841 (Favicon, apple-touch-icon links matching the defaults should not be...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 881195e..17e6fb0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -371,8 +371,6 @@ this. Was used when mwEmbed was going to be an extension.
 * (bugs 18407, 18409) Special:Upload is now listed on Special:Specialpages only
   if uploads are enabled and the user can access it
 * (bug 17988) Spaces before [[Category:]] links are no longer ignored
-* (bug 19392) Favicon, apple-touch-icon links matching the defaults are no 
-  longer sent
 * (bug 19957) All known-failing tests now marked disabled; added --run-disabled
   option to parser test suite to run disabled tests if desired.
 * (bug 16311) Make recent change flags (n/m/b) <abbr>s instead of <span>s

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2b3e7cb..25f53ac 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -156,7 +156,7 @@ $wgUploadPath       = false; ///< defaults to "{$wgScriptPath}/images"
 $wgUploadDirectory     = false; ///< defaults to "{$IP}/images"
 $wgHashedUploadDirectory       = true;
 $wgLogo                                = false; ///< defaults to "{$wgStylePath}/common/images/wiki.png"
-$wgFavicon                     = false; ///< will be treated as '/favicon.ico' anyway by user agents
+$wgFavicon                     = '/favicon.ico';
 $wgAppleTouchIcon   = false; ///< This one'll actually default to off. For iPhone and iPod Touch web app bookmarks
 $wgMathPath         = false; ///< defaults to "{$wgUploadPath}/math"
 $wgMathDirectory    = false; ///< defaults to "{$wgUploadDirectory}/math"

diff --git a/includes/Skin.php b/includes/Skin.php
index c4c7c33..cfb72cf 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -178,17 +178,15 @@ class Skin extends Linker {
 
                wfProfileIn( __METHOD__ );
 
-               # Add favicons and Apple touch icons, if they're not the defaults
-               #
                # Generally the order of the favicon and apple-touch-icon links
                # should not matter, but Konqueror (3.5.9 at least) incorrectly
                # uses whichever one appears later in the HTML source.  Make sure
                # apple-touch-icon is specified first to avoid this.
-               if( false !== $wgAppleTouchIcon && wfExpandUrl('/apple-touch-icon.png') != wfExpandUrl($wgAppleTouchIcon) ) {
+               if( false !== $wgAppleTouchIcon ) {
                        $out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) );
                }
 
-               if( false !== $wgFavicon && wfExpandUrl('/favicon.ico') != wfExpandUrl($wgFavicon) ) {
+               if( false !== $wgFavicon ) {
                        $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
                }