| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -118,6 +118,7 @@ |
| 119 | 119 | $wgUploadDirectory = "{$IP}/upload"; |
| 120 | 120 | $wgHashedUploadDirectory = true; |
| 121 | 121 | $wgLogo = "{$wgUploadPath}/wiki.png"; |
| | 122 | +$wgFavicon = '/favicon.ico'; |
| 122 | 123 | $wgMathPath = "{$wgUploadPath}/math"; |
| 123 | 124 | $wgMathDirectory = "{$wgUploadDirectory}/math"; |
| 124 | 125 | $wgTmpDirectory = "{$wgUploadDirectory}/tmp"; |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -156,10 +156,14 @@ |
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | function initPage( &$out ) { |
| | 160 | + global $wgFavicon; |
| | 161 | + |
| 160 | 162 | $fname = 'Skin::initPage'; |
| 161 | 163 | wfProfileIn( $fname ); |
| 162 | 164 | |
| 163 | | - $out->addLink( array( 'rel' => 'shortcut icon', 'href' => '/favicon.ico' ) ); |
| | 165 | + if( false !== $wgFavicon ) { |
| | 166 | + $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) ); |
| | 167 | + } |
| 164 | 168 | |
| 165 | 169 | $this->addMetadataLinks($out); |
| 166 | 170 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -589,6 +589,8 @@ |
| 590 | 590 | and seems to work ok with other bits. No longer including the IE |
| 591 | 591 | workarounds JavaScript for IE 7 and above. |
| 592 | 592 | * Fix extra namespace for Bulgarian |
| | 593 | +* (bug 4303) Add $wgFavicon to change the shorticon icon link from |
| | 594 | + the default /favicon.ico or disable it (if set to false) |
| 593 | 595 | |
| 594 | 596 | |
| 595 | 597 | === Caveats === |