Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use correct default value when calling Status::getWikiText

Browse source 
Both parameter have a default of false, not null.

Change-Id: I5754895347db244eee155f8cf5965df5f4fd2d1a
This commit is contained in:
Umherirrender 2021-10-16 22:35:01 +02:00
parent 42d554c930
commit 66d4e6a3d0
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
includes/auth/AuthManager.php
View file

@ -1145,7 +1145,7 @@ class AuthManager implements LoggerAwareInterface {
$this->logger->debug( __METHOD__ . ': {creator} cannot create users: {reason}', [
'user' => $username,
'creator' => $creator->getUser()->getName(),
'reason' => $status->getWikiText( null, null, 'en' )
'reason' => $status->getWikiText( false, false, 'en' )
] );
return AuthenticationResponse::newFail( $status->getMessage() );
}
@ -1157,7 +1157,7 @@ class AuthManager implements LoggerAwareInterface {
$this->logger->debug( __METHOD__ . ': {user} cannot be created: {reason}', [
'user' => $username,
'creator' => $creator->getUser()->getName(),
'reason' => $status->getWikiText( null, null, 'en' )
'reason' => $status->getWikiText( false, false, 'en' )
] );
return AuthenticationResponse::newFail( $status->getMessage() );
}
@ -1174,7 +1174,7 @@ class AuthManager implements LoggerAwareInterface {
$this->logger->debug( __METHOD__ . ': UserData is invalid: {reason}', [
'user' => $user->getName(),
'creator' => $creator->getUser()->getName(),
'reason' => $status->getWikiText( null, null, 'en' ),
'reason' => $status->getWikiText( false, false, 'en' ),
] );
return AuthenticationResponse::newFail( $status->getMessage() );
}
@ -1279,7 +1279,7 @@ class AuthManager implements LoggerAwareInterface {
$this->logger->debug( __METHOD__ . ': {creator} cannot create users: {reason}', [
'user' => $user->getName(),
'creator' => $creator->getName(),
'reason' => $status->getWikiText( null, null, 'en' )
'reason' => $status->getWikiText( false, false, 'en' )
] );
$ret = AuthenticationResponse::newFail( $status->getMessage() );
$this->callMethodOnProviders( 7, 'postAccountCreation', [ $user, $creator, $ret ] );
@ -1334,7 +1334,7 @@ class AuthManager implements LoggerAwareInterface {
$this->logger->debug( __METHOD__ . ': UserData is invalid: {reason}', [
'user' => $user->getName(),
'creator' => $creator->getName(),
'reason' => $status->getWikiText( null, null, 'en' ),
'reason' => $status->getWikiText( false, false, 'en' ),
] );
$ret = AuthenticationResponse::newFail( $status->getMessage() );
$this->callMethodOnProviders( 7, 'postAccountCreation', [ $user, $creator, $ret ] );
@ -1758,7 +1758,7 @@ class AuthManager implements LoggerAwareInterface {
$ret = Status::wrap( $status );
$this->logger->debug( __METHOD__ . ': Provider denied creation of {username}: {reason}', [
'username' => $username,
'reason' => $ret->getWikiText( null, null, 'en' ),
'reason' => $ret->getWikiText( false, false, 'en' ),
] );
$session->set( 'AuthManager::AutoCreateBlacklist', $status );
$user->setId( 0 );
@ -1802,7 +1802,7 @@ class AuthManager implements LoggerAwareInterface {
} else {
$this->logger->error( __METHOD__ . ': {username} failed with message {msg}', [
'username' => $username,
'msg' => $status->getWikiText( null, null, 'en' )
'msg' => $status->getWikiText( false, false, 'en' )
] );
$user->setId( 0 );
$user->loadFromId();

2
includes/installer/Installer.php
View file

@ -1715,7 +1715,7 @@ abstract class Installer {
] );
if ( !$status->isGood() ) {
return Status::newFatal( 'config-admin-error-password',
$name, $status->getWikiText( null, null, $this->getVar( '_UserLang' ) ) );
$name, $status->getWikiText( false, false, $this->getVar( '_UserLang' ) ) );
}
$userGroupManager = MediaWikiServices::getInstance()->getUserGroupManager();

2
includes/jobqueue/jobs/ThumbnailRenderJob.php
View file

@ -134,7 +134,7 @@ class ThumbnailRenderJob extends Job {
return true;
} else {
$this->setLastError( __METHOD__ . ': HTTP request failure: '
. Status::wrap( $status )->getWikiText( null, null, 'en' ) );
. Status::wrap( $status )->getWikiText( false, false, 'en' ) );
}
return false;
}

2
tests/phpunit/includes/StatusTest.php
View file

@ -747,7 +747,7 @@ class StatusTest extends MediaWikiLangTestCase {
/** @var MessageLocalizer $messageLocalizer */
$status->setMessageLocalizer( $messageLocalizer );
$status->getWikiText();
$status->getWikiText( null, null, 'en' );
$status->getWikiText( false, false, 'en' );
$status->getWikiText( 'wrap-short', 'wrap-long' );
}