From 8c3e5040fc082490bd6dcf6d711b00b22858aa8f Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Tue, 25 Aug 2009 22:27:32 +0000 Subject: [PATCH] Revert r53841 (Favicon, apple-touch-icon links matching the defaults should not be sent). Doesn't actually work upon further testing --- RELEASE-NOTES | 2 -- includes/DefaultSettings.php | 2 +- includes/Skin.php | 6 ++---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 881195eb20..17e6fb0d20 100644 --- 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) s instead of s diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 2b3e7cb4f0..25f53ac7b9 100644 --- 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 c4c7c33196..cfb72cf72a 100644 --- 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 ) ); } -- 2.20.1