From: Reedy <reedy@wikimedia.org>
Date: Thu, 23 Nov 2017 12:06:59 +0000 (+0000)
Subject: Minor code updates to SpecialListgrouprights
X-Git-Tag: 1.31.0-rc.0~1400^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=40c690d3a6a3f31d40c1eaf2c5143d4543b5d11f

Minor code updates to SpecialListgrouprights

Use some newer code inside MediaWiki.

Explicit function visibility modifiers.

Improve return comment.

Change-Id: I4f6ec2bd8ef6ceeac8d480dcac76f0e04c09f2a3
---

diff --git a/includes/specials/SpecialListgrouprights.php b/includes/specials/SpecialListgrouprights.php
index 2315887aa5..2ca4190a76 100644
--- a/includes/specials/SpecialListgrouprights.php
+++ b/includes/specials/SpecialListgrouprights.php
@@ -29,7 +29,7 @@
  * @author Petr Kadlec <mormegil@centrum.cz>
  */
 class SpecialListGroupRights extends SpecialPage {
-	function __construct() {
+	public function __construct() {
 		parent::__construct( 'Listgrouprights' );
 	}
 
@@ -81,14 +81,10 @@ class SpecialListGroupRights extends SpecialPage {
 				? 'all'
 				: $group;
 
-			$msg = $this->msg( 'group-' . $groupname );
-			$groupnameLocalized = !$msg->isBlank() ? $msg->text() : $groupname;
+			$groupnameLocalized = UserGroupMembership::getGroupName( $groupname );
 
-			$msg = $this->msg( 'grouppage-' . $groupname )->inContentLanguage();
-			$grouppageLocalized = !$msg->isBlank() ?
-				$msg->text() :
-				MWNamespace::getCanonicalName( NS_PROJECT ) . ':' . $groupname;
-			$grouppageLocalizedTitle = Title::newFromText( $grouppageLocalized );
+			$grouppageLocalizedTitle = UserGroupMembership::getGroupPage( $groupname )
+				?: Title::newFromText( MWNamespace::getCanonicalName( NS_PROJECT ) . ':' . $groupname );
 
 			if ( $group == '*' || !$grouppageLocalizedTitle ) {
 				// Do not make a link for the generic * group or group with invalid group page
@@ -231,7 +227,7 @@ class SpecialListGroupRights extends SpecialPage {
 	 * @param array $remove Array of groups this group is allowed to remove or true
 	 * @param array $addSelf Array of groups this group is allowed to add to self or true
 	 * @param array $removeSelf Array of group this group is allowed to remove from self or true
-	 * @return string List of all granted permissions, separated by comma separator
+	 * @return string HTML list of all granted permissions
 	 */
 	private function formatPermissions( $permissions, $revoke, $add, $remove, $addSelf, $removeSelf ) {
 		$r = [];