Hide skin tab in preferences entirely is $wgAllowUserSkin is false, remove the skin...

Also ensure that PreferencesForm::mSkin is always normalized and is only saved if $wgAllowUserSkin is true.

diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index b5349e7..ca13d68 100644 (file)
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -835,37 +835,31 @@ class PreferencesForm {
                # Skin
                #
                global $wgAllowUserSkin;
-               
-               if( !$wgAllowUserSkin ) {
-                       $wgOut->addHTML( "<p><em>" . wfMsg('skin-override') . "</em></p>" );
-               }
-               
-               $wgOut->addHTML( "<fieldset>\n<legend>\n" . wfMsg('skin') . "</legend>\n" );
-               $mptitle = Title::newMainPage();
-               $previewtext = wfMsg('skin-preview');
-               # Only show members of Skin::getSkinNames() rather than
-               # $skinNames (skins is all skin names from Language.php)
-               $validSkinNames = Skin::getUsableSkins();
-               # Sort by UI skin name. First though need to update validSkinNames as sometimes
-               # the skinkey & UI skinname differ (e.g. "standard" skinkey is "Classic" in the UI).
-               foreach ($validSkinNames as $skinkey => & $skinname ) {
-                       if ( isset( $skinNames[$skinkey] ) )  {
-                               $skinname = $skinNames[$skinkey];
+               if( $wgAllowUserSkin ) {
+                       $wgOut->addHTML( "<fieldset>\n<legend>\n" . wfMsg('skin') . "</legend>\n" );
+                       $mptitle = Title::newMainPage();
+                       $previewtext = wfMsg('skin-preview');
+                       # Only show members of Skin::getSkinNames() rather than
+                       # $skinNames (skins is all skin names from Language.php)
+                       $validSkinNames = Skin::getUsableSkins();
+                       # Sort by UI skin name. First though need to update validSkinNames as sometimes
+                       # the skinkey & UI skinname differ (e.g. "standard" skinkey is "Classic" in the UI).
+                       foreach ($validSkinNames as $skinkey => & $skinname ) {
+                               if ( isset( $skinNames[$skinkey] ) )  {
+                                       $skinname = $skinNames[$skinkey];
+                               }
                        }
+                       asort($validSkinNames);
+                       foreach ($validSkinNames as $skinkey => $sn ) {
+                               $checked = $skinkey == $this->mSkin ? ' checked="checked"' : '';
+                               $mplink = htmlspecialchars($mptitle->getLocalURL("useskin=$skinkey"));
+                               $previewlink = $wgAllowUserSkin ? "(<a target='_blank' href=\"$mplink\">$previewtext</a>)" : '';
+                               if( $skinkey == $wgDefaultSkin )
+                                       $sn .= ' (' . wfMsg( 'default' ) . ')';
+                               $wgOut->addHTML( "<input type='radio' name='wpSkin' id=\"wpSkin$skinkey\" value=\"$skinkey\"$checked /> <label for=\"wpSkin$skinkey\">{$sn}</label> $previewlink<br />\n" );
+                       }
+                       $wgOut->addHTML( "</fieldset>\n\n" );
                }
-               asort($validSkinNames);
-               foreach ($validSkinNames as $skinkey => $sn ) {
-                       $checked = $skinkey == $this->mSkin ? ' checked="checked"' : '';
-                       
-                       $checked = $wgAllowUserSkin ? $checked . '' : $checked . ' disabled=\'disabled\'';
-
-                       $mplink = htmlspecialchars($mptitle->getLocalURL("useskin=$skinkey"));
-                       $previewlink = $wgAllowUserSkin ? "(<a target='_blank' href=\"$mplink\">$previewtext</a>)" : '';
-                       if( $skinkey == $wgDefaultSkin )
-                               $sn .= ' (' . wfMsg( 'default' ) . ')';
-                       $wgOut->addHTML( "<input type='radio' name='wpSkin' id=\"wpSkin$skinkey\" value=\"$skinkey\"$checked /> <label for=\"wpSkin$skinkey\">{$sn}</label> $previewlink<br />\n" );
-               }
-               $wgOut->addHTML( "</fieldset>\n\n" );
 
                # Math
                #

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 1ddd160..a70561a 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -1080,7 +1080,6 @@ Wenn du dich mit dem Thema auskennst, kannst du selbst [[:$1|die Seite verfassen
 'qbsettings-floatingright' => 'Rechts, schwebend',
 'changepassword'           => 'Passwort ändern',
 'skin'                     => 'Skin',
-'skin-override'            => 'Dieses Formular wurde deaktiviert, da dieses Wiki die Skineinstellungen ignoriert und den Standardskin verwendet, der vom Administrator festgelegt wurde.',
 'skin-preview'             => 'Vorschau',
 'math'                     => 'TeX',
 'dateformat'               => 'Datumsformat',

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 4da9c90..63b6fed 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1494,7 +1494,6 @@ Note that their indexes of {{SITENAME}} content may be out of date.',
 'qbsettings-floatingright' => 'Floating right',
 'changepassword'           => 'Change password',
 'skin'                     => 'Skin',
-'skin-override'            => 'This form has been disabled, because this wiki overrides user skin settings with the default skin set by the administrator.',
 'skin-preview'             => 'Preview',
 'math'                     => 'Math',
 'dateformat'               => 'Date format',

diff --git a/languages/messages/MessagesEo.php b/languages/messages/MessagesEo.php
index edce948..472a7c9 100644 (file)
--- a/languages/messages/MessagesEo.php
+++ b/languages/messages/MessagesEo.php
@@ -1074,7 +1074,6 @@ indekso pro troŝarĝita servilo. Intertempe, vi povas serĉi per <i>guglo</i> a
 'qbsettings-floatingright' => 'Ŝvebas dekstre',
 'changepassword'           => 'Ŝanĝi pasvorton',
 'skin'                     => 'Etoso',
-'skin-override'            => 'Ĉi tiu paĝo estis malŝaltita, ĉar ĉi tiu vikio anstataŭigas la etosajn preferojn kun la defaŭlta etosaro de la administranto.',
 'skin-preview'             => 'Antaŭrigardo',
 'math'                     => 'Matematikaĵoj',
 'dateformat'               => 'Datformato',

diff --git a/languages/messages/MessagesEs.php b/languages/messages/MessagesEs.php
index 07e0691..a6e10a6 100644 (file)
--- a/languages/messages/MessagesEs.php
+++ b/languages/messages/MessagesEs.php
@@ -1060,7 +1060,6 @@ Las búsquedas fallidas suelen producirse al buscar palabras comunes como «la»
 'qbsettings-floatingright' => 'Flotante a la derecha',
 'changepassword'           => 'Cambiar la contraseña',
 'skin'                     => 'Apariencia',
-'skin-override'            => 'Este formulario ha sido deshabilitado, ya que esta wiki sustituye la selección de apariencia del usuario por la indicada por el administrador.',
 'skin-preview'             => 'Ver cómo queda',
 'math'                     => 'Fórmulas',
 'dateformat'               => 'Formato de fecha',

diff --git a/languages/messages/MessagesFa.php b/languages/messages/MessagesFa.php
index 7e096b7..6fe35f9 100644 (file)
--- a/languages/messages/MessagesFa.php
+++ b/languages/messages/MessagesFa.php
@@ -1268,7 +1268,6 @@ $2',
 'qbsettings-floatingright' => 'شناور راست',
 'changepassword'           => 'تغییر گذرواژه',
 'skin'                     => 'پوسته',
-'skin-override'            => 'این فرم غیر فعال شده‌است، زیرا این ویکی تنظیم پوسته توسط کاربر را با پوستهٔ پیش‌فرض که توسط مدیر تعیین شده باطل می‌سازد.',
 'skin-preview'             => 'پیش‌نمایش',
 'math'                     => 'نمایش ریاضیات',
 'dateformat'               => 'قالب تاریخ',

diff --git a/languages/messages/MessagesFr.php b/languages/messages/MessagesFr.php
index d63192b..e1f3958 100644 (file)
--- a/languages/messages/MessagesFr.php
+++ b/languages/messages/MessagesFr.php
@@ -1101,7 +1101,6 @@ Assurez-vous que ce changement conserve la continuité de l’historique.',
 'qbsettings-floatingright' => 'Flottante à droite',
 'changepassword'           => 'Modification du mot de passe',
 'skin'                     => 'Habillage',
-'skin-override'            => 'Ce formulaire a été désactivé, parce ce wiki écrase les paramètres d’interface utilisateur avec celle par défaut établie par l’administrateur.',
 'skin-preview'             => 'Prévisualiser',
 'math'                     => 'Rendu des maths',
 'dateformat'               => 'Format de date',

diff --git a/languages/messages/MessagesGl.php b/languages/messages/MessagesGl.php
index f0784ca..7fb4658 100644 (file)
--- a/languages/messages/MessagesGl.php
+++ b/languages/messages/MessagesGl.php
@@ -1033,7 +1033,6 @@ Note que os seus índices do contido de {{SITENAME}} poden estar desactualizados
 'qbsettings-floatingright' => 'Flotante á dereita',
 'changepassword'           => 'Cambiar o meu contrasinal',
 'skin'                     => 'Aparencia',
-'skin-override'            => 'Este formulario foi deshabilitado porque este wiki sobreescribe a apariencia de usuario coa apariencia por defecto fixada polo administrador.',
 'skin-preview'             => 'Probar',
 'math'                     => 'Fórmulas matemáticas',
 'dateformat'               => 'Formato da data',

diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index 7aff292..b84d61d 100644 (file)
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -1209,7 +1209,6 @@ $2',
 'qbsettings-floatingright' => 'צף מימין',
 'changepassword'           => 'שינוי סיסמה',
 'skin'                     => 'עיצוב',
-'skin-override'            => 'טופס זה אינו פעיל, כיוון שבאתר ויקי זה נקבע העיצוב על ידי מנהל האתר, והמשתמשים אינם יכולים לשנותו.',
 'skin-preview'             => 'תצוגה מקדימה',
 'math'                     => 'נוסחאות מתמטיות',
 'dateformat'               => 'מבנה תאריך',

diff --git a/languages/messages/MessagesHr.php b/languages/messages/MessagesHr.php
index 16988c0..7039da8 100644 (file)
--- a/languages/messages/MessagesHr.php
+++ b/languages/messages/MessagesHr.php
@@ -1181,7 +1181,6 @@ Primijetite da uporaba navigacijskih poveznica resetira vaše izbore u koloni.',
 'qbsettings-floatingright' => 'Desno leteće',
 'changepassword'           => 'Promjena lozinke',
 'skin'                     => 'Izgled',
-'skin-override'            => 'Ovaj obrazac je isključen, jer ova wiki premošćuje osobne suradničke postavke izgleda s glavnim izgledom postavljenim od strane administratora.',
 'skin-preview'             => 'Pregled',
 'math'                     => 'Prikaz matematičkih formula',
 'dateformat'               => 'Format datuma',

diff --git a/languages/messages/MessagesHu.php b/languages/messages/MessagesHu.php
index 6b93eb3..a650324 100644 (file)
--- a/languages/messages/MessagesHu.php
+++ b/languages/messages/MessagesHu.php
@@ -1177,7 +1177,6 @@ Győződj meg róla, hogy a laptörténet folytonossága megmarad.',
 'qbsettings-floatingright' => 'Lebegő jobboldali',
 'changepassword'           => 'Jelszócsere',
 'skin'                     => 'Felület',
-'skin-override'            => 'A felület nem módosítható, mert a wiki adminisztrátora álltja be az alapértelmezett kinézetet.',
 'skin-preview'             => 'előnézet',
 'math'                     => 'Képletek',
 'dateformat'               => 'Dátum formátuma',

diff --git a/languages/messages/MessagesIa.php b/languages/messages/MessagesIa.php
index 7c863c7..e7172aa 100644 (file)
--- a/languages/messages/MessagesIa.php
+++ b/languages/messages/MessagesIa.php
@@ -1062,7 +1062,6 @@ Nota que lor indices del contento de {{SITENAME}} pote esser obsolete.',
 'qbsettings-floatingright' => 'Flottante a derecta',
 'changepassword'           => 'Cambiar contrasigno',
 'skin'                     => 'Stilo',
-'skin-override'            => 'Iste formulario ha essite disactivate, post que iste wiki ultrapassa le configurationes de stilo del usator con le stilo predefinite per le administrator.',
 'skin-preview'             => 'Previsualisation',
 'math'                     => 'Mathematica',
 'dateformat'               => 'Formato de datas',

diff --git a/languages/messages/MessagesKsh.php b/languages/messages/MessagesKsh.php
index c75bcad..8bb86b2 100644 (file)
--- a/languages/messages/MessagesKsh.php
+++ b/languages/messages/MessagesKsh.php
@@ -1202,7 +1202,6 @@ dat dänne ihr Daate topaktuell sin,
 'qbsettings-floatingright' => 'Am rächte Rand am Schwevve',
 'changepassword'           => 'Passwood ändere',
 'skin'                     => 'Et Ussinn',
-'skin-override'            => 'Di Ußwahl eß affjeschlldt, weil mer alß Metmaacher hee en dämm Wiki sing Ovverfläsh nit ußsöhke kann. Dat määt dä Wiki-Köbes.',
 'skin-preview'             => 'Vör-Ansich',
 'math'                     => 'Mathematisch Formele',
 'dateformat'               => 'Em Datum sing Fomat',

diff --git a/languages/messages/MessagesLb.php b/languages/messages/MessagesLb.php
index 913b6df..a2f3a9a 100644 (file)
--- a/languages/messages/MessagesLb.php
+++ b/languages/messages/MessagesLb.php
@@ -997,7 +997,6 @@ Dir kënnt [[:\$1|déi Säit uleeën]].",
 'qbsettings-floatingright' => 'Schwiewt riets',
 'changepassword'           => 'Passwuert änneren',
 'skin'                     => 'Skin',
-'skin-override'            => 'Dëse Formulaire ass ausgeschalt, well op dëser Wiki Skin Astellungen vun de Benotzer duerch déi Astellungen ersat sinn déi den Admistrateur par défaut agestallt huet.',
 'skin-preview'             => 'Kucken',
 'dateformat'               => 'Datumsformat',
 'datedefault'              => 'Egal (Standard)',

diff --git a/languages/messages/MessagesNl.php b/languages/messages/MessagesNl.php
index 5783d07..dce9046 100644 (file)
--- a/languages/messages/MessagesNl.php
+++ b/languages/messages/MessagesNl.php
@@ -1233,7 +1233,6 @@ De gegevens over {{SITENAME}} zijn mogelijk niet bijgewerkt.',
 'qbsettings-floatingright' => 'Rechts zwevend',
 'changepassword'           => 'Wachtwoord wijzigen',
 'skin'                     => 'Vormgeving',
-'skin-override'            => 'Dit formulier is uitgeschakeld omdat in deze wiki alleen het door de beheerder gekozen uiterlijk weergegeven kan worden.',
 'skin-preview'             => 'Voorbeeld',
 'math'                     => 'Formules',
 'dateformat'               => 'Datumopmaak',

diff --git a/languages/messages/MessagesPl.php b/languages/messages/MessagesPl.php
index b7d7212..cf9c38a 100644 (file)
--- a/languages/messages/MessagesPl.php
+++ b/languages/messages/MessagesPl.php
@@ -1143,7 +1143,6 @@ Jednak informacje o treści {{GRAMMAR:D.lp|{{SITENAME}}}} mogą być w Google ni
 'qbsettings-floatingright' => 'Unoszący się, z prawej',
 'changepassword'           => 'Zmiana hasła',
 'skin'                     => 'Skórka',
-'skin-override'            => 'Formularz został wyłączony, ponieważ na tej wiki administrator ustawił jedną domyślną skórkę.',
 'skin-preview'             => 'podgląd',
 'math'                     => 'Wzory',
 'dateformat'               => 'Format daty',

diff --git a/languages/messages/MessagesQu.php b/languages/messages/MessagesQu.php
index 94c307d..b3d88f1 100644 (file)
--- a/languages/messages/MessagesQu.php
+++ b/languages/messages/MessagesQu.php
@@ -952,7 +952,6 @@ Takyachikuy kay hukchayqa allin wiñay kawsay ñiqita ama waqllichunchu chaylla.
 'qbsettings-floatingright' => 'Pañaman tuytuy',
 'changepassword'           => 'Yaykuna rimata hukchay',
 'skin'                     => 'Qara',
-'skin-override'            => "Kay hunt'ana p'anqaqa manam saqillasqachu kachkan, kay wiki ruraqpa qara allinchasqankunata kamachiqpa churasqan kikinmanta qarawan huknachaptinmi.",
 'skin-preview'             => 'Ñawpaqta qhaway',
 'math'                     => 'Minuywa',
 'dateformat'               => "P'unchaw pacha chanta",

diff --git a/languages/messages/MessagesSzl.php b/languages/messages/MessagesSzl.php
index fb279a8..9bed7dc 100644 (file)
--- a/languages/messages/MessagesSzl.php
+++ b/languages/messages/MessagesSzl.php
@@ -873,7 +873,6 @@ Možeš [[:\$1|tako utwořyć]], abo sprůbować pounygo šnupańo.",
 'qbsettings-floatingright' => 'Unošůncy śe, s prawyj',
 'changepassword'           => 'Zmjana hasua',
 'skin'                     => 'Skůrka',
-'skin-override'            => 'Formulař je wyuůnčůny skiž tygo, co admińistrator tyj Wiki naštalowou yno jydna skůrka.',
 'skin-preview'             => 'podglůnd',
 'math'                     => 'Wzory',
 'dateformat'               => 'Format daty',

diff --git a/languages/messages/MessagesVi.php b/languages/messages/MessagesVi.php
index 0010f20..977ecd5 100644 (file)
--- a/languages/messages/MessagesVi.php
+++ b/languages/messages/MessagesVi.php
@@ -1065,7 +1065,6 @@ Xin hãy bảo đảm giữ vững tính liên tục của lịch sử trang.',
 'qbsettings-floatingright' => 'Nổi bên phải',
 'changepassword'           => 'Đổi mật khẩu',
 'skin'                     => 'Hình dạng',
-'skin-override'            => 'Biểu mẫu này bị tắt vì hình dạng mặc định do quản lý viên đặt đè lên các thiết lập hình dạng cá nhân tại wiki này.',
 'skin-preview'             => 'Xem thử',
 'math'                     => 'Công thức toán',
 'dateformat'               => 'Kiểu ngày tháng',