jenkins-bot has submitted this change and it was merged.
Change subject: Replace deprecated $wgSpecialPageGroups
......................................................................
Replace deprecated $wgSpecialPageGroups
$wgSpecialPageGroups is deprecated since 1.21
override SpecialPage::getGroupName instead
GlobalGroupMembership inherit SpecialPage::getGroupName from
SpecialUserrights
Change-Id: Ic250e6a6fe20aa06db98370c6d6de2006c037431
---
M CentralAuth.php
M includes/CentralAuthHooks.php
M includes/specials/SpecialCentralAuth.php
M includes/specials/SpecialGlobalGroupPermissions.php
M includes/specials/SpecialGlobalRenameQueue.php
M includes/specials/SpecialGlobalRenameRequest.php
M includes/specials/SpecialGlobalUsers.php
M includes/specials/SpecialMergeAccount.php
M includes/specials/SpecialMultiLock.php
M includes/specials/SpecialWikiSets.php
10 files changed, 32 insertions(+), 10 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CentralAuth.php b/CentralAuth.php
index 2876ad0..da05b50 100644
--- a/CentralAuth.php
+++ b/CentralAuth.php
@@ -434,13 +434,6 @@
$wgSpecialPages['GlobalRenameProgress'] = 'SpecialGlobalRenameProgress';
$wgSpecialPages['GlobalUserMerge'] = 'SpecialGlobalUserMerge';
$wgSpecialPages['UsersWhoWillBeRenamed'] = 'SpecialUsersWhoWillBeRenamed';
-$wgSpecialPageGroups['CentralAuth'] = 'users';
-$wgSpecialPageGroups['MergeAccount'] = 'login';
-$wgSpecialPageGroups['GlobalGroupMembership'] = 'users';
-$wgSpecialPageGroups['GlobalGroupPermissions'] = 'users';
-$wgSpecialPageGroups['WikiSets'] = 'wiki';
-$wgSpecialPageGroups['GlobalUsers'] = 'users';
-$wgSpecialPageGroups['MultiLock'] = 'users';
$wgAPIModules['deleteglobalaccount'] = 'ApiDeleteGlobalAccount';
$wgAPIModules['setglobalaccountstatus'] = 'ApiSetGlobalAccountStatus';
diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php
index b2eb7fb..c13ae50 100644
--- a/includes/CentralAuthHooks.php
+++ b/includes/CentralAuthHooks.php
@@ -9,7 +9,7 @@
*/
public static function onRunExtensionFunctions() {
global $wgAutoloadClasses, $wgExtensionCredits, $wgHooks;
- global $wgSpecialPages, $wgSpecialPageGroups,
$wgResourceModules;
+ global $wgSpecialPages, $wgResourceModules;
global $wgCentralAuthEnableGlobalRenameRequest;
global $wgCentralAuthCheckSULMigration;
$caBase = __DIR__ . '/..';
@@ -57,7 +57,6 @@
'descriptionmsg' => 'globalrenamerequest-desc',
);
$wgSpecialPages['GlobalRenameRequest'] =
'SpecialGlobalRenameRequest';
- $wgSpecialPageGroups['GlobalRenameRequest'] = 'login';
$wgResourceModules['ext.centralauth.globalrenamerequest'] = array(
'position' => 'top',
'scripts' => array(
@@ -81,7 +80,6 @@
'descriptionmsg' => 'globalrenamequeue-desc',
);
$wgSpecialPages['GlobalRenameQueue'] =
'SpecialGlobalRenameQueue';
- $wgSpecialPageGroups['GlobalRenameQueue'] = 'users';
$wgResourceModules['ext.centralauth.globalrenamequeue']
= array(
'scripts' =>
'ext.centralauth.globalrenamequeue.js',
'localBasePath' => "{$caBase}/modules",
diff --git a/includes/specials/SpecialCentralAuth.php
b/includes/specials/SpecialCentralAuth.php
index 55d5f49..d96d620 100644
--- a/includes/specials/SpecialCentralAuth.php
+++ b/includes/specials/SpecialCentralAuth.php
@@ -847,4 +847,8 @@
}
return $mergeMethodDescriptions;
}
+
+ protected function getGroupName() {
+ return 'users';
+ }
}
diff --git a/includes/specials/SpecialGlobalGroupPermissions.php
b/includes/specials/SpecialGlobalGroupPermissions.php
index 30191a5..df0df38 100644
--- a/includes/specials/SpecialGlobalGroupPermissions.php
+++ b/includes/specials/SpecialGlobalGroupPermissions.php
@@ -532,4 +532,8 @@
$cu->quickInvalidateCache();
}
}
+
+ protected function getGroupName() {
+ return 'users';
+ }
}
diff --git a/includes/specials/SpecialGlobalRenameQueue.php
b/includes/specials/SpecialGlobalRenameQueue.php
index a65141e..ecfbc7b 100644
--- a/includes/specials/SpecialGlobalRenameQueue.php
+++ b/includes/specials/SpecialGlobalRenameQueue.php
@@ -545,6 +545,10 @@
);
return UserMailer::send( $to, $from, $subject, $body );
}
+
+ protected function getGroupName() {
+ return 'users';
+ }
}
diff --git a/includes/specials/SpecialGlobalRenameRequest.php
b/includes/specials/SpecialGlobalRenameRequest.php
index 288868d..9345c8c 100644
--- a/includes/specials/SpecialGlobalRenameRequest.php
+++ b/includes/specials/SpecialGlobalRenameRequest.php
@@ -300,4 +300,8 @@
public function requiresUnblock() {
return false;
}
+
+ protected function getGroupName() {
+ return 'login';
+ }
}
diff --git a/includes/specials/SpecialGlobalUsers.php
b/includes/specials/SpecialGlobalUsers.php
index ae62e46..cc00eff 100644
--- a/includes/specials/SpecialGlobalUsers.php
+++ b/includes/specials/SpecialGlobalUsers.php
@@ -37,6 +37,10 @@
$this->getOutput()->addHTML( Html::rawElement( 'ul', null,
$pg->getBody() ) );
$this->getOutput()->addHTML( $pg->getNavigationBar() );
}
+
+ protected function getGroupName() {
+ return 'users';
+ }
}
class GlobalUsersPager extends AlphabeticPager {
diff --git a/includes/specials/SpecialMergeAccount.php
b/includes/specials/SpecialMergeAccount.php
index 4de91d1..215c962 100644
--- a/includes/specials/SpecialMergeAccount.php
+++ b/includes/specials/SpecialMergeAccount.php
@@ -641,4 +641,8 @@
private function dryRunError() {
$this->getOutput()->addWikiMsg( 'centralauth-disabled-dryrun' );
}
+
+ protected function getGroupName() {
+ return 'login';
+ }
}
diff --git a/includes/specials/SpecialMultiLock.php
b/includes/specials/SpecialMultiLock.php
index 53704f1..8d4031c 100644
--- a/includes/specials/SpecialMultiLock.php
+++ b/includes/specials/SpecialMultiLock.php
@@ -475,4 +475,8 @@
);
}
}
+
+ protected function getGroupName() {
+ return 'users';
+ }
}
diff --git a/includes/specials/SpecialWikiSets.php
b/includes/specials/SpecialWikiSets.php
index 2796607..87c7d78 100644
--- a/includes/specials/SpecialWikiSets.php
+++ b/includes/specials/SpecialWikiSets.php
@@ -398,4 +398,7 @@
LogEventsList::showLogExtract( $out, 'gblrights',
$title->getPrefixedText() );
}
+ protected function getGroupName() {
+ return 'wiki';
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/211284
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic250e6a6fe20aa06db98370c6d6de2006c037431
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
