From fff578a12dc4bd75225c67ce82c3cedc2a50f24c Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Tue, 6 Mar 2018 11:18:45 -0500 Subject: [PATCH] Don't target log_user_text for registered users Apparently when log_user_text was added no one bothered to populate it for existing rows. Sigh, #Technical-Debt. Bug: T188826 Change-Id: Ice1e6454e439a4abdf9594f6e964478dd484bc20 --- includes/api/ApiQueryLogEvents.php | 4 +--- includes/logging/LogPager.php | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php index 68902a31c8..84e12d7dfa 100644 --- a/includes/api/ApiQueryLogEvents.php +++ b/includes/api/ApiQueryLogEvents.php @@ -172,10 +172,8 @@ class ApiQueryLogEvents extends ApiQueryBase { if ( !is_null( $user ) ) { // Note the joins in $q are the same as those from ->getJoin() above // so we only need to add 'conds' here. - // Don't query by user ID here, it might be able to use the - // log_user_text_time or log_user_text_type_time index. $q = $actorMigration->getWhere( - $db, 'log_user', User::newFromName( $params['user'], false ), false + $db, 'log_user', User::newFromName( $params['user'], false ) ); $this->addWhere( $q['conds'] ); } diff --git a/includes/logging/LogPager.php b/includes/logging/LogPager.php index d1acacf1b4..24fdfb0195 100644 --- a/includes/logging/LogPager.php +++ b/includes/logging/LogPager.php @@ -178,10 +178,8 @@ class LogPager extends ReverseChronologicalPager { $name = $usertitle->getText(); // Assume no joins required for log_user - // Don't query by user ID here, it might be able to use the - // log_user_text_time or log_user_text_type_time index. $this->mConds[] = ActorMigration::newMigration()->getWhere( - wfGetDB( DB_REPLICA ), 'log_user', User::newFromName( $name, false ), false + wfGetDB( DB_REPLICA ), 'log_user', User::newFromName( $name, false ) )['conds']; $this->enforcePerformerRestrictions(); -- 2.20.1