| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -156,7 +156,7 @@ |
| 157 | 157 | $wgUploadDirectory = false; ///< defaults to "{$IP}/images" |
| 158 | 158 | $wgHashedUploadDirectory = true; |
| 159 | 159 | $wgLogo = false; ///< defaults to "{$wgStylePath}/common/images/wiki.png" |
| 160 | | -$wgFavicon = false; ///< will be treated as '/favicon.ico' anyway by user agents |
| | 160 | +$wgFavicon = '/favicon.ico'; |
| 161 | 161 | $wgAppleTouchIcon = false; ///< This one'll actually default to off. For iPhone and iPod Touch web app bookmarks |
| 162 | 162 | $wgMathPath = false; ///< defaults to "{$wgUploadPath}/math" |
| 163 | 163 | $wgMathDirectory = false; ///< defaults to "{$wgUploadDirectory}/math" |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -178,17 +178,15 @@ |
| 179 | 179 | |
| 180 | 180 | wfProfileIn( __METHOD__ ); |
| 181 | 181 | |
| 182 | | - # Add favicons and Apple touch icons, if they're not the defaults |
| 183 | | - # |
| 184 | 182 | # Generally the order of the favicon and apple-touch-icon links |
| 185 | 183 | # should not matter, but Konqueror (3.5.9 at least) incorrectly |
| 186 | 184 | # uses whichever one appears later in the HTML source. Make sure |
| 187 | 185 | # apple-touch-icon is specified first to avoid this. |
| 188 | | - if( false !== $wgAppleTouchIcon && wfExpandUrl('/apple-touch-icon.png') != wfExpandUrl($wgAppleTouchIcon) ) { |
| | 186 | + if( false !== $wgAppleTouchIcon ) { |
| 189 | 187 | $out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) ); |
| 190 | 188 | } |
| 191 | 189 | |
| 192 | | - if( false !== $wgFavicon && wfExpandUrl('/favicon.ico') != wfExpandUrl($wgFavicon) ) { |
| | 190 | + if( false !== $wgFavicon ) { |
| 193 | 191 | $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) ); |
| 194 | 192 | } |
| 195 | 193 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -371,8 +371,6 @@ |
| 372 | 372 | * (bugs 18407, 18409) Special:Upload is now listed on Special:Specialpages only |
| 373 | 373 | if uploads are enabled and the user can access it |
| 374 | 374 | * (bug 17988) Spaces before [[Category:]] links are no longer ignored |
| 375 | | -* (bug 19392) Favicon, apple-touch-icon links matching the defaults are no |
| 376 | | - longer sent |
| 377 | 375 | * (bug 19957) All known-failing tests now marked disabled; added --run-disabled |
| 378 | 376 | option to parser test suite to run disabled tests if desired. |
| 379 | 377 | * (bug 16311) Make recent change flags (n/m/b) <abbr>s instead of <span>s |