jenkins-bot has submitted this change and it was merged.
Change subject: SpecialListgrouprights: Use Config instead of globals
......................................................................
SpecialListgrouprights: Use Config instead of globals
Change-Id: I4c8e48adab856de4e3b736b6ae0366588fb82bc5
---
M includes/specials/SpecialListgrouprights.php
1 file changed, 27 insertions(+), 23 deletions(-)
Approvals:
Umherirrender: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialListgrouprights.php
b/includes/specials/SpecialListgrouprights.php
index b5818ea..822e4d3 100644
--- a/includes/specials/SpecialListgrouprights.php
+++ b/includes/specials/SpecialListgrouprights.php
@@ -38,10 +38,6 @@
* @param string|null $par
*/
public function execute( $par ) {
- global $wgImplicitGroups;
- global $wgGroupPermissions, $wgRevokePermissions, $wgAddGroups,
$wgRemoveGroups;
- global $wgGroupsAddToSelf, $wgGroupsRemoveFromSelf;
-
$this->setHeaders();
$this->outputHeader();
@@ -58,19 +54,26 @@
'</tr>'
);
+ $config = $this->getConfig();
+ $groupPermissions = $config->get( 'GroupPermissions' );
+ $revokePermissions = $config->get( 'RevokePermissions' );
+ $addGroups = $config->get( 'AddGroups' );
+ $removeGroups = $config->get( 'RemoveGroups' );
+ $groupsAddToSelf = $config->get( 'GroupsAddToSelf' );
+ $groupsRemoveFromSelf = $config->get( 'GroupsRemoveFromSelf' );
$allGroups = array_unique( array_merge(
- array_keys( $wgGroupPermissions ),
- array_keys( $wgRevokePermissions ),
- array_keys( $wgAddGroups ),
- array_keys( $wgRemoveGroups ),
- array_keys( $wgGroupsAddToSelf ),
- array_keys( $wgGroupsRemoveFromSelf )
+ array_keys( $groupPermissions ),
+ array_keys( $revokePermissions ),
+ array_keys( $addGroups ),
+ array_keys( $removeGroups ),
+ array_keys( $groupsAddToSelf ),
+ array_keys( $groupsRemoveFromSelf )
) );
asort( $allGroups );
foreach ( $allGroups as $group ) {
- $permissions = isset( $wgGroupPermissions[$group] )
- ? $wgGroupPermissions[$group]
+ $permissions = isset( $groupPermissions[$group] )
+ ? $groupPermissions[$group]
: array();
$groupname = ( $group == '*' ) // Replace * with a more
descriptive groupname
? 'all'
@@ -100,7 +103,7 @@
SpecialPage::getTitleFor( 'Listusers' ),
$this->msg( 'listgrouprights-members'
)->escaped()
);
- } elseif ( !in_array( $group, $wgImplicitGroups ) ) {
+ } elseif ( !in_array( $group, $config->get(
'ImplicitGroups' ) ) ) {
$grouplink = '<br />' . Linker::linkKnown(
SpecialPage::getTitleFor( 'Listusers' ),
$this->msg( 'listgrouprights-members'
)->escaped(),
@@ -112,12 +115,12 @@
$grouplink = '';
}
- $revoke = isset( $wgRevokePermissions[$group] ) ?
$wgRevokePermissions[$group] : array();
- $addgroups = isset( $wgAddGroups[$group] ) ?
$wgAddGroups[$group] : array();
- $removegroups = isset( $wgRemoveGroups[$group] ) ?
$wgRemoveGroups[$group] : array();
- $addgroupsSelf = isset( $wgGroupsAddToSelf[$group] ) ?
$wgGroupsAddToSelf[$group] : array();
- $removegroupsSelf = isset(
$wgGroupsRemoveFromSelf[$group] )
- ? $wgGroupsRemoveFromSelf[$group]
+ $revoke = isset( $revokePermissions[$group] ) ?
$revokePermissions[$group] : array();
+ $addgroups = isset( $addGroups[$group] ) ?
$addGroups[$group] : array();
+ $removegroups = isset( $removeGroups[$group] ) ?
$removeGroups[$group] : array();
+ $addgroupsSelf = isset( $groupsAddToSelf[$group] ) ?
$groupsAddToSelf[$group] : array();
+ $removegroupsSelf = isset(
$groupsRemoveFromSelf[$group] )
+ ? $groupsRemoveFromSelf[$group]
: array();
$id = $group == '*' ? false : Sanitizer::escapeId(
$group );
@@ -135,10 +138,11 @@
}
private function outputNamespaceProtectionInfo() {
- global $wgNamespaceProtection, $wgParser, $wgContLang;
+ global $wgParser, $wgContLang;
$out = $this->getOutput();
+ $namespaceProtection = $this->getConfig()->get(
'NamespaceProtection' );
- if ( count( $wgNamespaceProtection ) == 0 ) {
+ if ( count( $namespaceProtection ) == 0 ) {
return;
}
@@ -161,8 +165,8 @@
)
);
- ksort( $wgNamespaceProtection );
- foreach ( $wgNamespaceProtection as $namespace => $rights ) {
+ ksort( $namespaceProtection );
+ foreach ( $namespaceProtection as $namespace => $rights ) {
if ( !in_array( $namespace,
MWNamespace::getValidNamespaces() ) ) {
continue;
}
--
To view, visit https://gerrit.wikimedia.org/r/151544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4c8e48adab856de4e3b736b6ae0366588fb82bc5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
