jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383925 )
Change subject: Update for deprecation of selectFields() methods
......................................................................
Update for deprecation of selectFields() methods
Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556, replaced with getQueryInfo() methods.
Change-Id: I401809d2638b11e6c77a318fc8fbbc41fa639083
Depends-On: Idcfd15568489d9f03a7ba4460e96610d33bc4089
---
M includes/LocalRenameJob/LocalRenameUserJob.php
M includes/specials/SpecialUsersWhoWillBeRenamed.php
2 files changed, 13 insertions(+), 6 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/LocalRenameJob/LocalRenameUserJob.php
b/includes/LocalRenameJob/LocalRenameUserJob.php
index c31b835..56c5a77 100644
--- a/includes/LocalRenameJob/LocalRenameUserJob.php
+++ b/includes/LocalRenameJob/LocalRenameUserJob.php
@@ -57,11 +57,14 @@
if ( isset( $this->params['force'] ) && $this->params['force']
) {
// If we're dealing with an invalid username, load the
data ourselves to avoid
// any normalization at all done by User or Title.
+ $userQuery = User::getQueryInfo();
$row = wfGetDB( DB_MASTER )->selectRow(
- 'user',
- User::selectFields(),
+ $userQuery['tables'],
+ $userQuery['fields'],
[ 'user_name' => $from ],
- __METHOD__
+ __METHOD__,
+ [],
+ $userQuery['joins']
);
$oldUser = User::newFromRow( $row );
} else {
diff --git a/includes/specials/SpecialUsersWhoWillBeRenamed.php
b/includes/specials/SpecialUsersWhoWillBeRenamed.php
index b269448..d7d54c4 100644
--- a/includes/specials/SpecialUsersWhoWillBeRenamed.php
+++ b/includes/specials/SpecialUsersWhoWillBeRenamed.php
@@ -67,13 +67,17 @@
}
$dbr = wfGetDB( DB_REPLICA );
+ $userQuery = User::getQueryInfo();
+ $blockQuery = Block::getQueryInfo();
+ $ipbUser = isset( $blockQuery['ipb_user'] ) ?
$blockQuery['ipb_user'] : 'ipb_user';
$res = $dbr->select(
- [ 'user', 'ipblocks' ],
- User::selectFields(),
+ $userQuery['tables'] + [ 'nestblock' =>
$blockQuery['tables'] ],
+ $userQuery['fields'],
[ 'user_name' => array_unique( $names ), 'ipb_deleted
IS NULL OR ipb_deleted = 0' ],
__METHOD__,
[], // $options
- [ 'ipblocks' => [ 'LEFT JOIN', 'user_id = ipb_user' ] ]
+ [ 'nestblock' => [ 'LEFT JOIN', "user_id = $ipbUser" ] ]
+ + $userQuery['joins'] + $blockQuery['joins']
);
$userArray = UserArray::newFromResult( $res );
--
To view, visit https://gerrit.wikimedia.org/r/383925
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I401809d2638b11e6c77a318fc8fbbc41fa639083
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: 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
