From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 19 Jan 2008 05:39:41 +0000 (+0000)
Subject: * (bug 12668) Support for custom iPhone bookmark icon via $wgAppleTouchIcon
X-Git-Tag: 1.31.0-rc.0~49914
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=82d82072238c8ead1cc33507fc704c6cc2dba3c3;p=lhc%2Fweb%2Fwiklou.git

* (bug 12668) Support for custom iPhone bookmark icon via $wgAppleTouchIcon
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 782c03d7fd..2c19b19d89 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -134,6 +134,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 18585) Added a bunch of parameters to the revertpage message
 * Support redirects in image namespace
 * (bug 10049) Prefix index search and namespaces in Special:Withoutinterwiki
+* (bug 12668) Support for custom iPhone bookmark icon via $wgAppleTouchIcon
+
 
 === Bug fixes in 1.12 ===
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index efea489be3..e39f20b512 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -157,6 +157,7 @@ $wgUploadDirectory	= false; /// defaults to "{$IP}/images"
 $wgHashedUploadDirectory	= true;
 $wgLogo				= false; /// defaults to "{$wgStylePath}/common/images/wiki.png"
 $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"
 $wgTmpDirectory     = false; /// defaults to "{$wgUploadDirectory}/tmp"
diff --git a/includes/Skin.php b/includes/Skin.php
index e693f921c6..fe4bb93974 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -153,13 +153,17 @@ class Skin extends Linker {
 	}
 
 	function initPage( &$out ) {
-		global $wgFavicon, $wgScriptPath, $wgSitename, $wgContLang;
+		global $wgFavicon, $wgAppleTouchIcon, $wgScriptPath, $wgSitename, $wgContLang;
 
 		wfProfileIn( __METHOD__ );
 
 		if( false !== $wgFavicon ) {
 			$out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
 		}
+		
+		if( false !== $wgAppleTouchIcon ) {
+			$out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) );
+		} 		
 
 		$code = $wgContLang->getCode();
 		$name = $wgContLang->getLanguageName( $code );