Reverting r43581 "Added a new user right called "alwaysuseskin" that allows the user...

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.

diff --git a/includes/User.php b/includes/User.php
index 6ddd3c6..898a9f3 100644 (file)
--- 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 14e9158..66cccc8 100644 (file)
--- 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;