From 35984ebb37c9e21f3001b4997965c6d739f9df82 Mon Sep 17 00:00:00 2001 From: Umherirrender Date: Fri, 5 Jan 2024 21:26:44 +0100 Subject: [PATCH] replaceAll.php: Replace get_class with instanceof The User class was namespaced in 1d0b7ae1, checking class names as string is broken, use instanceof. There are no subclasses of User class to ignore at this point. Also use User::getName instead of implicit User::__toString Change-Id: I8b9f73609a7ef9f781c8a5ae27e00d612d33ee4f --- maintenance/replaceAll.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/maintenance/replaceAll.php b/maintenance/replaceAll.php index 01742a9..b109984 100644 --- a/maintenance/replaceAll.php +++ b/maintenance/replaceAll.php @@ -30,6 +30,7 @@ namespace MediaWiki\Extension\ReplaceText; use Maintenance; +use MediaWiki\User\User; use MWException; $IP = getenv( 'MW_INSTALL_PATH' ) ?: __DIR__ . '/../../..'; @@ -112,7 +113,7 @@ class ReplaceAll extends Maintenance { $userFactory->newFromId( $userReplacing ) : $userFactory->newFromName( $userReplacing ); - if ( get_class( $user ) !== 'User' ) { + if ( !$user instanceof User ) { $this->fatalError( "Couldn't translate '$userReplacing' to a user." ); @@ -437,7 +438,7 @@ EOF; $this->botEdit = true; } if ( !$this->getReply( - "Attribute changes to the user '{$this->user}'?$comment" + "Attribute changes to the user '{$this->user->getName()}'?$comment" ) ) { return; }