X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fuser%2FUserArray.php;h=66d9c7a1f8cc5eb1a2067168b23d5459fb82e70b;hb=c2f9376c19335219d403e602496fa44f4a3e7b55;hp=ab6683b297ec1d8e57ae8865651879c5cce06836;hpb=c1d5106e1d0ff2634d3c23977ca8fc32e38ec426;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/user/UserArray.php b/includes/user/UserArray.php
index ab6683b297..66d9c7a1f8 100644
--- a/includes/user/UserArray.php
+++ b/includes/user/UserArray.php
@@ -20,11 +20,11 @@
  * @file
  */
 
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\IResultWrapper;
 
 abstract class UserArray implements Iterator {
 	/**
-	 * @param ResultWrapper $res
+	 * @param IResultWrapper $res
 	 * @return UserArrayFromResult
 	 */
 	static function newFromResult( $res ) {
@@ -49,11 +49,14 @@ abstract class UserArray implements Iterator {
 			return new ArrayIterator( [] );
 		}
 		$dbr = wfGetDB( DB_REPLICA );
+		$userQuery = User::getQueryInfo();
 		$res = $dbr->select(
-			'user',
-			User::selectFields(),
+			$userQuery['tables'],
+			$userQuery['fields'],
 			[ 'user_id' => array_unique( $ids ) ],
-			__METHOD__
+			__METHOD__,
+			[],
+			$userQuery['joins']
 		);
 		return self::newFromResult( $res );
 	}
@@ -70,17 +73,20 @@ abstract class UserArray implements Iterator {
 			return new ArrayIterator( [] );
 		}
 		$dbr = wfGetDB( DB_REPLICA );
+		$userQuery = User::getQueryInfo();
 		$res = $dbr->select(
-			'user',
-			User::selectFields(),
+			$userQuery['tables'],
+			$userQuery['fields'],
 			[ 'user_name' => array_unique( $names ) ],
-			__METHOD__
+			__METHOD__,
+			[],
+			$userQuery['joins']
 		);
 		return self::newFromResult( $res );
 	}
 
 	/**
-	 * @param ResultWrapper $res
+	 * @param IResultWrapper $res
 	 * @return UserArrayFromResult
 	 */
 	protected static function newFromResult_internal( $res ) {