X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQueryUsers.php;h=5b094cd9084a8c7087a84b6af05fb86b78b78248;hb=be42e09aa866d7def54ead06c91d5dc9c8210ce5;hp=3a814c4c49f1bb411af0c7937644afb8a2dc008c;hpb=39cd742864b4cf225a0337843200c1b3558420a0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 3a814c4c49..5b094cd908 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -172,10 +172,8 @@ class ApiQueryUsers extends ApiQueryBase {
 				$this->addJoinConds( [ 'user_groups' => [ 'INNER JOIN', 'ug_user=user_id' ] ] );
 				$this->addFields( [ 'user_name' ] );
 				$this->addFields( UserGroupMembership::selectFields() );
-				if ( !$this->getConfig()->get( 'DisableUserGroupExpiry' ) ) {
-					$this->addWhere( 'ug_expiry IS NULL OR ug_expiry >= ' .
-						$db->addQuotes( $db->timestamp() ) );
-				}
+				$this->addWhere( 'ug_expiry IS NULL OR ug_expiry >= ' .
+					$db->addQuotes( $db->timestamp() ) );
 				$userGroupsRes = $this->select( __METHOD__ );
 
 				foreach ( $userGroupsRes as $row ) {
@@ -216,7 +214,7 @@ class ApiQueryUsers extends ApiQueryBase {
 				}
 
 				if ( isset( $this->prop['groupmemberships'] ) ) {
-					$data[$key]['groupmemberships'] = array_map( function( $ugm ) {
+					$data[$key]['groupmemberships'] = array_map( function ( $ugm ) {
 						return [
 							'group' => $ugm->getGroup(),
 							'expiry' => ApiResult::formatExpiry( $ugm->getExpiry() ),
@@ -406,6 +404,6 @@ class ApiQueryUsers extends ApiQueryBase {
 	}
 
 	public function getHelpUrls() {
-		return 'https://www.mediawiki.org/wiki/API:Users';
+		return 'https://www.mediawiki.org/wiki/Special:MyLanguage/API:Users';
 	}
 }