Merge "Fix i18n message tog-watchlistunwatchlinks"

[lhc/web/wiklou.git] / includes / user / UserArray.php

diff --git a/includes/user/UserArray.php b/includes/user/UserArray.php
index dddc850..66d9c7a 100644 (file)
--- a/includes/user/UserArray.php
+++ b/includes/user/UserArray.php
@@ -20,9 +20,11 @@
  * @file
  */
 
+use Wikimedia\Rdbms\IResultWrapper;
+
 abstract class UserArray implements Iterator {
        /**
-        * @param ResultWrapper $res
+        * @param IResultWrapper $res
         * @return UserArrayFromResult
         */
        static function newFromResult( $res ) {
@@ -38,7 +40,7 @@ abstract class UserArray implements Iterator {
 
        /**
         * @param array $ids
-        * @return UserArrayFromResult
+        * @return UserArrayFromResult|ArrayIterator
         */
        static function newFromIDs( $ids ) {
                $ids = array_map( 'intval', (array)$ids ); // paranoia
@@ -47,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 );
        }
@@ -59,7 +64,7 @@ abstract class UserArray implements Iterator {
        /**
         * @since 1.25
         * @param array $names
-        * @return UserArrayFromResult
+        * @return UserArrayFromResult|ArrayIterator
         */
        static function newFromNames( $names ) {
                $names = array_map( 'strval', (array)$names ); // paranoia
@@ -68,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 ) {