X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialUserrights.php;h=d5affc78735db87a88fde1900b8f6bd2882698f9;hb=4e618302d9e7b96c008d3dfa3c0554cff52d5222;hp=740f2f7e36a2877fea509acfdf2da1069b6e6b2f;hpb=a5b975edd132e52ee8ce1c725d8195da941c8b7b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index 740f2f7e36..d5affc7873 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -250,8 +250,6 @@ class UserrightsPage extends SpecialPage {
 	 * @return array Tuple of added, then removed groups
 	 */
 	function doSaveUserGroups( $user, $add, $remove, $reason = '' ) {
-		global $wgAuth;
-
 		// Validate input set...
 		$isself = $user->getName() == $this->getUser()->getName();
 		$groups = $user->getGroups();
@@ -293,7 +291,9 @@ class UserrightsPage extends SpecialPage {
 
 		// update groups in external authentication database
 		Hooks::run( 'UserGroupsChanged', [ $user, $add, $remove, $this->getUser(), $reason ] );
-		$wgAuth->updateExternalDBGroups( $user, $add, $remove );
+		MediaWiki\Auth\AuthManager::callLegacyAuthPlugin(
+			'updateExternalDBGroups', [ $user, $add, $remove ]
+		);
 
 		wfDebug( 'oldGroups: ' . print_r( $oldGroups, true ) . "\n" );
 		wfDebug( 'newGroups: ' . print_r( $newGroups, true ) . "\n" );
@@ -417,28 +417,18 @@ class UserrightsPage extends SpecialPage {
 		return Status::newGood( $user );
 	}
 
-	function makeGroupNameList( $ids ) {
-		if ( empty( $ids ) ) {
-			return $this->msg( 'rightsnone' )->inContentLanguage()->text();
-		} else {
-			return implode( ', ', $ids );
-		}
-	}
-
 	/**
-	 * Make a list of group names to be stored as parameter for log entries
+	 * @since 1.15
 	 *
-	 * @deprecated since 1.21; use LogFormatter instead.
 	 * @param array $ids
+	 *
 	 * @return string
 	 */
-	function makeGroupNameListForLog( $ids ) {
-		wfDeprecated( __METHOD__, '1.21' );
-
+	public function makeGroupNameList( $ids ) {
 		if ( empty( $ids ) ) {
-			return '';
+			return $this->msg( 'rightsnone' )->inContentLanguage()->text();
 		} else {
-			return $this->makeGroupNameList( $ids );
+			return implode( ', ', $ids );
 		}
 	}