| 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 = '/favicon.ico'; |
| | 160 | +$wgFavicon = false; ///< will be treated as '/favicon.ico' anyway by user agents |
| 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,15 +178,17 @@ |
| 179 | 179 | |
| 180 | 180 | wfProfileIn( __METHOD__ ); |
| 181 | 181 | |
| | 182 | + # Add favicons and Apple touch icons, if they're not the defaults |
| | 183 | + # |
| 182 | 184 | # Generally the order of the favicon and apple-touch-icon links |
| 183 | 185 | # should not matter, but Konqueror (3.5.9 at least) incorrectly |
| 184 | 186 | # uses whichever one appears later in the HTML source. Make sure |
| 185 | 187 | # apple-touch-icon is specified first to avoid this. |
| 186 | | - if( false !== $wgAppleTouchIcon ) { |
| | 188 | + if( false !== $wgAppleTouchIcon && wfExpandUrl('/apple-touch-icon.png') != wfExpandUrl($wgAppleTouchIcon) ) { |
| 187 | 189 | $out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) ); |
| 188 | 190 | } |
| 189 | 191 | |
| 190 | | - if( false !== $wgFavicon ) { |
| | 192 | + if( false !== $wgFavicon && wfExpandUrl('/favicon.ico') != wfExpandUrl($wgFavicon) ) { |
| 191 | 193 | $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) ); |
| 192 | 194 | } |
| 193 | 195 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -341,6 +341,8 @@ |
| 342 | 342 | * (bugs 18407, 18409) Special:Upload is now listed on Special:Specialpages only |
| 343 | 343 | if uploads are enabled and the user can access it |
| 344 | 344 | * (bug 17988) Spaces before [[Category:]] links are no longer ignored |
| | 345 | +* (bug 19392) Favicon, apple-touch-icon links matching the defaults are no |
| | 346 | + longer sent |
| 345 | 347 | |
| 346 | 348 | == API changes in 1.16 == |
| 347 | 349 | |