dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Use {{int:}} on MediaWiki:Blockedtext and MediaWiki:Autoblockedtext"
[lhc/web/wiklou.git]
/
includes
/
user
/
UserArray.php
diff --git
a/includes/user/UserArray.php
b/includes/user/UserArray.php
index
ab6683b
..
66d9c7a
100644
(file)
--- a/
includes/user/UserArray.php
+++ b/
includes/user/UserArray.php
@@
-20,11
+20,11
@@
* @file
*/
* @file
*/
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\
I
ResultWrapper;
abstract class UserArray implements Iterator {
/**
abstract class UserArray implements Iterator {
/**
- * @param ResultWrapper $res
+ * @param
I
ResultWrapper $res
* @return UserArrayFromResult
*/
static function newFromResult( $res ) {
* @return UserArrayFromResult
*/
static function newFromResult( $res ) {
@@
-49,11
+49,14
@@
abstract class UserArray implements Iterator {
return new ArrayIterator( [] );
}
$dbr = wfGetDB( DB_REPLICA );
return new ArrayIterator( [] );
}
$dbr = wfGetDB( DB_REPLICA );
+ $userQuery = User::getQueryInfo();
$res = $dbr->select(
$res = $dbr->select(
-
'user'
,
-
User::selectFields()
,
+
$userQuery['tables']
,
+
$userQuery['fields']
,
[ 'user_id' => array_unique( $ids ) ],
[ 'user_id' => array_unique( $ids ) ],
- __METHOD__
+ __METHOD__,
+ [],
+ $userQuery['joins']
);
return self::newFromResult( $res );
}
);
return self::newFromResult( $res );
}
@@
-70,17
+73,20
@@
abstract class UserArray implements Iterator {
return new ArrayIterator( [] );
}
$dbr = wfGetDB( DB_REPLICA );
return new ArrayIterator( [] );
}
$dbr = wfGetDB( DB_REPLICA );
+ $userQuery = User::getQueryInfo();
$res = $dbr->select(
$res = $dbr->select(
-
'user'
,
-
User::selectFields()
,
+
$userQuery['tables']
,
+
$userQuery['fields']
,
[ 'user_name' => array_unique( $names ) ],
[ 'user_name' => array_unique( $names ) ],
- __METHOD__
+ __METHOD__,
+ [],
+ $userQuery['joins']
);
return self::newFromResult( $res );
}
/**
);
return self::newFromResult( $res );
}
/**
- * @param ResultWrapper $res
+ * @param
I
ResultWrapper $res
* @return UserArrayFromResult
*/
protected static function newFromResult_internal( $res ) {
* @return UserArrayFromResult
*/
protected static function newFromResult_internal( $res ) {