From b4068ae92232d30e1a1f5e568c521d2b2febf751 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Fri, 19 Jun 2015 22:04:25 +0200 Subject: [PATCH] Remove double str_replace( ' ', '_', $ ) when using LinkBatch LinkBatch::add already handle the underscore/space part, that means it is not need to do it on the caller side when adding user names to LinkBatch Change-Id: I09e80712903a539164141cc0a88d321203114677 --- includes/cache/UserCache.php | 4 ++-- includes/specials/SpecialBlockList.php | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/includes/cache/UserCache.php b/includes/cache/UserCache.php index 8a42489c71..2a3aac2d19 100644 --- a/includes/cache/UserCache.php +++ b/includes/cache/UserCache.php @@ -123,11 +123,11 @@ class UserCache { $lb = new LinkBatch(); foreach ( $usersToCheck as $userId => $name ) { if ( $this->queryNeeded( $userId, 'userpage', $options ) ) { - $lb->add( NS_USER, str_replace( ' ', '_', $row->user_name ) ); + $lb->add( NS_USER, $row->user_name ); $this->typesCached[$userId]['userpage'] = 1; } if ( $this->queryNeeded( $userId, 'usertalk', $options ) ) { - $lb->add( NS_USER_TALK, str_replace( ' ', '_', $row->user_name ) ); + $lb->add( NS_USER_TALK, $row->user_name ); $this->typesCached[$userId]['usertalk'] = 1; } } diff --git a/includes/specials/SpecialBlockList.php b/includes/specials/SpecialBlockList.php index 4dd313bce8..8a9aefde77 100644 --- a/includes/specials/SpecialBlockList.php +++ b/includes/specials/SpecialBlockList.php @@ -431,16 +431,12 @@ class BlockListPager extends TablePager { $lb->setCaller( __METHOD__ ); foreach ( $result as $row ) { - # Usernames and titles are in fact related by a simple substitution of space -> underscore - # The last few lines of Title::secureAndSplit() tell the story. - $name = str_replace( ' ', '_', $row->ipb_address ); - $lb->add( NS_USER, $name ); - $lb->add( NS_USER_TALK, $name ); + $lb->add( NS_USER, $row->ipb_address ); + $lb->add( NS_USER_TALK, $row->ipb_address ); if ( isset( $row->by_user_name ) ) { - $username = str_replace( ' ', '_', $row->by_user_name ); - $lb->add( NS_USER, $username ); - $lb->add( NS_USER_TALK, $username ); + $lb->add( NS_USER, $row->by_user_name ); + $lb->add( NS_USER_TALK, $row->by_user_name ); } } -- 2.20.1