wikimedia/mediawiki-extensions-Thanks
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Thanks synced 2024-11-15 19:09:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Stop using legacy ActorMigration field "log_user""

Browse source
This commit is contained in:
jenkins-bot 2021-04-29 14:37:07 +00:00 committed by Gerrit Code Review
parent a3ee345fe0 49c82e02e5
commit 9bd53fc8a1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/ApiThank.php
View file

@ -2,7 +2,6 @@
namespace MediaWiki\Extension\Thanks; namespace MediaWiki\Extension\Thanks;
use ActorMigration;
use ApiBase; use ApiBase;
use ExtensionRegistry; use ExtensionRegistry;
use ManualLogEntry; use ManualLogEntry;
@ -84,18 +83,19 @@ abstract class ApiThank extends ApiBase {
*/ */
protected function haveAlreadyThanked( User $thanker, $uniqueId ) { protected function haveAlreadyThanked( User $thanker, $uniqueId ) {
$dbw = wfGetDB( DB_MASTER ); $dbw = wfGetDB( DB_MASTER );
$logWhere = ActorMigration::newMigration()->getWhere( $dbw, 'log_user', $thanker ); $thankerActor = MediaWikiServices::getInstance()->getActorNormalization()
->acquireActorId( $thanker, $dbw );
return (bool)$dbw->selectRow( return (bool)$dbw->selectRow(
[ 'log_search', 'logging' ] + $logWhere['tables'], [ 'log_search', 'logging' ],
[ 'ls_value' ], [ 'ls_value' ],
[ [
$logWhere['conds'], 'log_actor' => $thankerActor,
'ls_field' => 'thankid', 'ls_field' => 'thankid',
'ls_value' => $uniqueId, 'ls_value' => $uniqueId,
], ],
__METHOD__, __METHOD__,
[], [],
[ 'logging' => [ 'INNER JOIN', 'ls_log_id=log_id' ] ] + $logWhere['joins'] [ 'logging' => [ 'INNER JOIN', 'ls_log_id=log_id' ] ]
); );
} }