From a9fb7a25b95855d551d362db2fea5e3f722546cd Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 17 Nov 2008 19:51:53 +0000 Subject: [PATCH] Reverting r43581 "Added a new user right called "alwaysuseskin" that allows the user to use and set their configured skin even if the wiki administrator has chosen to disable user skins for the rest of the wiki. Req. by Alexfusco5." Seems a little weird to me; I'm not quite sure the use case. :) Comments on the revision note that it needs documentation as well, and the name is a bit weird. If it is needed/desireable it might be better to just replace $wgAllowUserSkin with a right 'useskin' or something. --- includes/User.php | 2 +- includes/specials/SpecialPreferences.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/User.php b/includes/User.php index 6ddd3c677c..898a9f34d1 100644 --- a/includes/User.php +++ b/includes/User.php @@ -2109,7 +2109,7 @@ class User { if ( ! isset( $this->mSkin ) ) { wfProfileIn( __METHOD__ ); - if( $wgAllowUserSkin || $this->isAllowed( 'alwaysuseskin' ) ) { + if( $wgAllowUserSkin ) { # get the user skin $userSkin = $this->getOption( 'skin' ); $userSkin = $wgRequest->getVal('useskin', $userSkin); diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php index 14e91585f7..66cccc81aa 100644 --- a/includes/specials/SpecialPreferences.php +++ b/includes/specials/SpecialPreferences.php @@ -269,7 +269,7 @@ class PreferencesForm { $wgUser->setOption( 'nickname', $this->mNick ); $wgUser->setOption( 'quickbar', $this->mQuickbar ); global $wgAllowUserSkin; - if( $wgAllowUserSkin || $wgUser->isAllowed( 'alwaysuseskin' ) ) { + if( $wgAllowUserSkin ) { $wgUser->setOption( 'skin', $this->mSkin ); } global $wgUseTeX; -- 2.20.1