| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -134,7 +134,9 @@ |
| 135 | 135 | * (bug 18585) Added a bunch of parameters to the revertpage message |
| 136 | 136 | * Support redirects in image namespace |
| 137 | 137 | * (bug 10049) Prefix index search and namespaces in Special:Withoutinterwiki |
| | 138 | +* (bug 12668) Support for custom iPhone bookmark icon via $wgAppleTouchIcon |
| 138 | 139 | |
| | 140 | + |
| 139 | 141 | === Bug fixes in 1.12 === |
| 140 | 142 | |
| 141 | 143 | * Subpages are now indexed for searching properly when using PostgreSQL |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -157,6 +157,7 @@ |
| 158 | 158 | $wgHashedUploadDirectory = true; |
| 159 | 159 | $wgLogo = false; /// defaults to "{$wgStylePath}/common/images/wiki.png" |
| 160 | 160 | $wgFavicon = '/favicon.ico'; |
| | 161 | +$wgAppleTouchIcon = false; /// This one'll actually default to off. For iPhone and iPod Touch web app bookmarks |
| 161 | 162 | $wgMathPath = false; /// defaults to "{$wgUploadPath}/math" |
| 162 | 163 | $wgMathDirectory = false; /// defaults to "{$wgUploadDirectory}/math" |
| 163 | 164 | $wgTmpDirectory = false; /// defaults to "{$wgUploadDirectory}/tmp" |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -153,13 +153,17 @@ |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | function initPage( &$out ) { |
| 157 | | - global $wgFavicon, $wgScriptPath, $wgSitename, $wgContLang; |
| | 157 | + global $wgFavicon, $wgAppleTouchIcon, $wgScriptPath, $wgSitename, $wgContLang; |
| 158 | 158 | |
| 159 | 159 | wfProfileIn( __METHOD__ ); |
| 160 | 160 | |
| 161 | 161 | if( false !== $wgFavicon ) { |
| 162 | 162 | $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) ); |
| 163 | 163 | } |
| | 164 | + |
| | 165 | + if( false !== $wgAppleTouchIcon ) { |
| | 166 | + $out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) ); |
| | 167 | + } |
| 164 | 168 | |
| 165 | 169 | $code = $wgContLang->getCode(); |
| 166 | 170 | $name = $wgContLang->getLanguageName( $code ); |