Merge "Random documentation tweaks"

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

diff --git a/includes/UserArray.php b/includes/UserArray.php
index 3b8f5c1..90d1134 100644 (file)
--- a/includes/UserArray.php
+++ b/includes/UserArray.php
@@ -44,11 +44,15 @@ abstract class UserArray implements Iterator {
                $ids = array_map( 'intval', (array)$ids ); // paranoia
                if ( !$ids ) {
                        // Database::select() doesn't like empty arrays
-                       return new ArrayIterator(array());
+                       return new ArrayIterator( array() );
                }
                $dbr = wfGetDB( DB_SLAVE );
-               $res = $dbr->select( 'user', '*', array( 'user_id' => $ids ),
-                       __METHOD__ );
+               $res = $dbr->select(
+                       'user',
+                       User::selectFields(),
+                       array( 'user_id' => array_unique( $ids ) ),
+                       __METHOD__
+               );
                return self::newFromResult( $res );
        }
 
@@ -61,7 +65,7 @@ abstract class UserArray implements Iterator {
        }
 }
 
-class UserArrayFromResult extends UserArray {
+class UserArrayFromResult extends UserArray implements Countable {
 
        /**
         * @var ResultWrapper