X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fapi%2FApiQueryAllUsers.php;h=fd95e1785a5327cbcd84bb09e649cd0fb859245e;hp=9e7ad67068ec9460a2b3347872f63e12ba5101b0;hb=6c9a2923fe1ee3a65cb027be5e781772f2b12fbd;hpb=1d7141b4de1c25ac07a257255e7707a6fa666c34

diff --git a/includes/api/ApiQueryAllUsers.php b/includes/api/ApiQueryAllUsers.php
index 9e7ad67068..fd95e1785a 100644
--- a/includes/api/ApiQueryAllUsers.php
+++ b/includes/api/ApiQueryAllUsers.php
@@ -122,9 +122,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
 					[
 						'ug1.ug_user=user_id',
 						'ug1.ug_group' => $params['group'],
-						$this->getConfig()->get( 'DisableUserGroupExpiry' ) ?
-							'1' :
-							'ug1.ug_expiry IS NULL OR ug1.ug_expiry >= ' . $db->addQuotes( $db->timestamp() )
+						'ug1.ug_expiry IS NULL OR ug1.ug_expiry >= ' . $db->addQuotes( $db->timestamp() )
 					]
 				]
 			] );
@@ -147,9 +145,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
 			$this->addJoinConds( [ 'ug1' => [ 'LEFT OUTER JOIN',
 				array_merge( [
 					'ug1.ug_user=user_id',
-					$this->getConfig()->get( 'DisableUserGroupExpiry' ) ?
-						'1' :
-						'ug1.ug_expiry IS NULL OR ug1.ug_expiry >= ' . $db->addQuotes( $db->timestamp() )
+					'ug1.ug_expiry IS NULL OR ug1.ug_expiry >= ' . $db->addQuotes( $db->timestamp() )
 				], $exclude )
 			] ] );
 			$this->addWhere( 'ug1.ug_user IS NULL' );
@@ -165,9 +161,7 @@ class ApiQueryAllUsers extends ApiQueryBase {
 			$this->addFields( [ 'groups' =>
 				$db->buildGroupConcatField( '|', 'user_groups', 'ug_group', [
 					'ug_user=user_id',
-					$this->getConfig()->get( 'DisableUserGroupExpiry' ) ?
-						'1' :
-						'ug_expiry IS NULL OR ug_expiry >= ' . $db->addQuotes( $db->timestamp() )
+					'ug_expiry IS NULL OR ug_expiry >= ' . $db->addQuotes( $db->timestamp() )
 				] )
 			] );
 		}
@@ -395,6 +389,6 @@ class ApiQueryAllUsers extends ApiQueryBase {
 	}
 
 	public function getHelpUrls() {
-		return 'https://www.mediawiki.org/wiki/API:Allusers';
+		return 'https://www.mediawiki.org/wiki/Special:MyLanguage/API:Allusers';
 	}
 }