wikimedia/mediawiki-extensions-TitleBlacklist
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TitleBlacklist synced 2024-11-15 02:03:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Update for API error i18n"

Browse source
This commit is contained in:
jenkins-bot 2016-12-06 09:31:13 +00:00 committed by Gerrit Code Review
parent f271bdcdd5 5652e3af69
commit 087a0e7733
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
TitleBlacklist.hooks.php
View file

@ -132,15 +132,12 @@ class TitleBlacklistHooks {
$blacklisted = $titleBlacklist->userCannot( $oldTitle, $user, 'edit' );
}
if ( $blacklisted instanceof TitleBlacklistEntry ) {
$errmsg = $blacklisted->getErrorMessage( 'move' );
ApiBase::$messageMap[$errmsg] = array(
'code' => $errmsg,
'info' => 'TitleBlacklist prevents this new title from being created or old title from being edited'
);
$status->fatal( $errmsg,
$status->fatal( ApiMessage::create( [
$blacklisted->getErrorMessage( 'move' ),
$blacklisted->getRaw(),
$oldTitle->getFullText(),
$newTitle->getFullText() );
$newTitle->getFullText()
] ) );
return false;
}

6
api/ApiQueryTitleBlacklist.php
View file

@ -45,7 +45,11 @@ class ApiQueryTitleBlacklist extends ApiBase {
$title = Title::newFromText( $params['title'] );
if ( !$title ) {
$this->dieUsageMsg( array( 'invalidtitle', $params['title'] ) );
if ( is_callable( [ $this, 'dieWithError' ] ) ) {
$this->dieWithError( array( 'apierror-invalidtitle', wfEscapeWikiText( $params['title'] ) ) );
} else {
$this->dieUsageMsg( array( 'invalidtitle', $params['title'] ) );
}
}
$blacklisted = TitleBlacklist::singleton()->userCannot( $title, $this->getUser(), $action, $override );