Revert r56635 "Implement a 'root' permission, which grants all other permissions...

I'd much rather keep permission keys clean and separate.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ed68a45..70365c1 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -232,9 +232,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   $wgAJAXCategoriesNamespaces.
 * Admins could disable some variants using $wgDisabledVariants now. ONLY apply
   on wikis enabled LanguageConverter.
-* A new permission, 'root', is created.  Analogous to root users on Unix
-  systems, the root permission effectively grants all other permissions on a
-  wiki. Useful for debugging and administration.
 * New configuration variable $wgShowPageOnRedlink that can be set to show the
   page instead of an edit interface when visiting a red link. The value can be
   specified for specific usergroups and namespaces.

diff --git a/includes/User.php b/includes/User.php
index 75749ec..7f40790 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -2154,8 +2154,7 @@ class User {
                }
                # Use strict parameter to avoid matching numeric 0 accidentally inserted
                # by misconfiguration: 0 == 'foo'
-               return in_array( $action, $this->getRights(), true )
-                       || in_array( 'root', $this->getRights(), true );
+               return in_array( $action, $this->getRights(), true );
        }
 
        /**

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 95ebc7a..7b90e91 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1932,7 +1932,6 @@ You can also choose to let others contact you through your user or talk page wit
 'right-reset-passwords'       => "Reset other users' passwords",
 'right-override-export-depth' => 'Export pages including linked pages up to a depth of 5',
 'right-versiondetail'         => 'Show the extended software version information',
-'right-root'                  => 'Perform all actions on the wiki',
 'right-sendemail'             => 'Send e-mail to other users',
 
 # User rights log

diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index f50f104..7f16fcf 100644 (file)
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1367,8 +1367,6 @@ An alternative wording for translators could be \'Get the wiki to accept a track
 'right-versiondetail'         => '{{doc-right|versiondetail}}
 
 Users having this right receive more detailed information on [[Special:Version]].',
-'right-root'                  => "{{doc-right|root}}
-Analogous to the 'root' permission on Unix systems, allows the user to perform ''any'' action on the wiki; effectively granting them all other permissions.",
 'right-sendemail'             => '{{doc-right}}',
 
 # User rights log

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index e76cd72..ef8ceb1 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1112,7 +1112,6 @@ $wgMessageStructure = array(
                'right-reset-passwords',
                'right-override-export-depth',
                'right-versiondetail',
-               'right-root',
                'right-sendemail',
        ),
        'rightslog' => array(