wikimedia/mediawiki-extensions-TitleBlacklist
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TitleBlacklist synced 2024-11-14 09:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show titleblacklist error message in html when using js api module

Browse source 
Parse the message in html according to the errorformat= in the url,
fallback to wikitext to avoid a breaking change.

Bug: T369244
Change-Id: I58b995b3663b7dd286267e640d8d56164bd9be0b
This commit is contained in:
Umherirrender 2024-07-16 22:57:46 +02:00
parent ea252fcf43
commit 4290e114d4
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
includes/Api/ApiTitleBlacklist.php
View file

@ -72,7 +72,12 @@ class ApiTitleBlacklist extends ApiBase {
$res->addValue( 'titleblacklist', 'result', 'blacklisted' ); $res->addValue( 'titleblacklist', 'result', 'blacklisted' );
// there aren't any messages for create(talk|page), using edit for those instead // there aren't any messages for create(talk|page), using edit for those instead
$message = $blacklisted->getErrorMessage( $action !== 'create' ? $action : 'edit' ); $message = $blacklisted->getErrorMessage( $action !== 'create' ? $action : 'edit' );
$res->addValue( 'titleblacklist', 'reason', $this->msg( $message, $result )->page( $title )->text() ); $messageObj = $this->msg( $message, $result )->page( $title );
if ( $this->getErrorFormatter()->getFormat() === 'html' ) {
$res->addValue( 'titleblacklist', 'reason', $messageObj->parse() );
} else {
$res->addValue( 'titleblacklist', 'reason', $messageObj->text() );
}
$res->addValue( 'titleblacklist', 'message', $message ); $res->addValue( 'titleblacklist', 'message', $message );
$res->addValue( 'titleblacklist', 'line', htmlspecialchars( $blacklisted->getRaw() ) ); $res->addValue( 'titleblacklist', 'line', htmlspecialchars( $blacklisted->getRaw() ) );
} else { } else {

6
modules/mediawiki.api.titleblacklist.js
View file

@ -25,7 +25,11 @@
this.get( { this.get( {
action: 'titleblacklist', action: 'titleblacklist',
tbaction: 'create', tbaction: 'create',
tbtitle: title.toString() tbtitle: title.toString(),
errorformat: 'html',
errorlang: mw.config.get( 'wgUserLanguage' ),
errorsuselocal: '',
formatversion: 2
} ) } )
.done( function ( data ) { .done( function ( data ) {
var result; var result;