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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index de9c3c3..d9dff2a 100644 (file)
--- 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 d5477d0..83b5440 100644 (file)
--- 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() {