From f0c02543f554f2a77bb23d7275f8f06d0998f64c Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Mon, 6 Jun 2016 14:59:23 -0700 Subject: [PATCH] InfoAction: Don't pass non-dbkeys to LinkBatch Usernames are stored with spaces instead of underscores, so this was causing exceptions later on when dbkeys were expected to be provided to TitleValue. Let Title take care of normalization from spaces format to underscores in Title::makeTitle(), and pass that object onto LinkBatch instead. Bug: T137147 Change-Id: Ia3606d30de61173e4d5526a9d7a77bd4b1710a05 --- includes/actions/InfoAction.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php index b5f7ff2536..7be2aa7566 100644 --- a/includes/actions/InfoAction.php +++ b/includes/actions/InfoAction.php @@ -478,16 +478,18 @@ class InfoAction extends FormlessAction { if ( $firstRev ) { $firstRevUser = $firstRev->getUserText( Revision::FOR_THIS_USER ); if ( $firstRevUser !== '' ) { - $batch->add( NS_USER, $firstRevUser ); - $batch->add( NS_USER_TALK, $firstRevUser ); + $firstRevUserTitle = Title::makeTitle( NS_USER, $firstRevUser ); + $batch->addObj( $firstRevUserTitle ); + $batch->addObj( $firstRevUserTitle->getTalkPage() ); } } if ( $lastRev ) { $lastRevUser = $lastRev->getUserText( Revision::FOR_THIS_USER ); if ( $lastRevUser !== '' ) { - $batch->add( NS_USER, $lastRevUser ); - $batch->add( NS_USER_TALK, $lastRevUser ); + $lastRevUserTitle = Title::makeTitle( NS_USER, $lastRevUser ); + $batch->addObj( $lastRevUserTitle ); + $batch->addObj( $lastRevUserTitle->getTalkPage() ); } } -- 2.20.1