jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383919 )
Change subject: Update for deprecation of selectFields() methods
......................................................................
Update for deprecation of selectFields() methods
Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556. This change adapts the extension to use the replacement
getQueryInfo() methods when available.
Change-Id: I300130c7b952a353ac28989d39d7f01366da2a37
---
M utils/TranslateSandbox.php
1 file changed, 15 insertions(+), 4 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/utils/TranslateSandbox.php b/utils/TranslateSandbox.php
index 7751d10..7c82cda 100644
--- a/utils/TranslateSandbox.php
+++ b/utils/TranslateSandbox.php
@@ -130,14 +130,25 @@
*/
public static function getUsers() {
$dbw = TranslateUtils::getSafeReadDB();
- $tables = [ 'user', 'user_groups' ];
- $fields = User::selectFields();
+ if ( is_callable( [ User::class, 'getQueryInfo' ] ) ) {
+ $userQuery = User::getQueryInfo();
+ } else {
+ $userQuery = [
+ 'tables' => [ 'user' ],
+ 'fields' => User::selectFields(),
+ 'joins' => [],
+ ];
+ }
+ $tables = array_merge( $userQuery['tables'], [ 'user_groups' ]
);
+ $fields = $userQuery['fields'];
$conds = [
'ug_group' => 'translate-sandboxed',
- 'ug_user = user_id',
];
+ $joins = [
+ 'user_groups' => [ 'JOIN', 'ug_user = user_id' ],
+ ] + $userQuery['joins'];
- $res = $dbw->select( $tables, $fields, $conds, __METHOD__ );
+ $res = $dbw->select( $tables, $fields, $conds, __METHOD__, [],
$joins );
return UserArray::newFromResult( $res );
}
--
To view, visit https://gerrit.wikimedia.org/r/383919
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I300130c7b952a353ac28989d39d7f01366da2a37
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
