From: Antoine Musso <hashar@users.mediawiki.org>
Date: Mon, 16 Apr 2007 13:23:16 +0000 (+0000)
Subject: Fix #3366 : require skins based on SkinTemplate to override the skinname property.
X-Git-Tag: 1.31.0-rc.0~53392
X-Git-Url: http://git.cyclocoop.org/%22.%24redirect_annul.%22?a=commitdiff_plain;h=be73785e8f76eade56772622bfc162fc6eca4459;p=lhc%2Fweb%2Fwiklou.git

Fix #3366 : require skins based on SkinTemplate to override the skinname property.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index de9c3c3d1e..d9dff2a296 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -313,6 +313,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 9554) Extension-provided group name messages not used
 * (bug 9565) Translate template namespace name for Hindi (hi)
 * (bug 8599) Correct localized names of zh-variants
+* (bug 3366) Require skins based on SkinTemplate to override the skinname
+  property.
 
 == Maintenance ==
 
diff --git a/includes/Skin.php b/includes/Skin.php
index d5477d04bd..83b54402c7 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -23,6 +23,7 @@ class Skin extends Linker {
 	var $rcMoveIndex;
 	var $mWatchLinkNum = 0; // Appended to end of watch link id's
 	/**#@-*/
+	protected $skinname = 'standard' ;
 
 	/** Constructor, call parent constructor */
 	function Skin() { parent::__construct(); }
@@ -142,8 +143,8 @@ class Skin extends Linker {
 	}
 
 	/** @return string skin name */
-	function getSkinName() {
-		return 'standard';
+	public function getSkinName() {
+		return $this->skinname;
 	}
 
 	function qbSetting() {