Remove unnecessary variable and use correct group method

ProfessionalWiki · Nov 8, 2021 · 700d2b5 · 700d2b5
1 parent d0baea2
commit 700d2b5
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/PermissionsHelper.php b/src/PermissionsHelper.php
@@ -85,13 +85,16 @@ protected function userHas( $attributeOfUser, $attributeNameInDomElement ) {
 		}
 
 		$expectedValues = $this->getValueListFromAttribute( $attributeNameInDomElement );
-		$services = MediaWikiServices::getInstance();
 		switch ( $attributeOfUser ) {
 			case 'group':
-				$observedValues = $services->getUserGroupManager()->getUserGroups( $user );
+				$observedValues = MediaWikiServices::getInstance()
+					->getUserGroupManager()
+					->getUserEffectiveGroups( $user );
 				break;
 			case 'permission';
-				$observedValues = $services->getPermissionManager()->getUserPermissions( $user );
+				$observedValues = MediaWikiServices::getInstance()
+					->getPermissionManager()
+					->getUserPermissions( $user );
 				break;
 		}
 		$effectiveValues = array_intersect( $expectedValues, $observedValues );