$actionUrl = $this->getTitle()->getLocalURL( 'action=submit' );
$token = $wgUser->editToken();
- $defaultreason = $wgRequest->getVal( 'wpInterwikiReason' ) ? $wgRequest->getVal( 'wpInterwikiReason' ) : wfMsgForContent( 'interwiki_defaultreason' );
+ $defaultreason = $wgRequest->getVal( 'wpInterwikiReason', wfMsgForContent( 'interwiki_defaultreason' ) );
switch( $action ){
case "delete":
$dbr = wfGetDB( DB_SLAVE );
$row = $dbr->selectRow( 'interwiki', '*', array( 'iw_prefix' => $prefix ) );
if( !$row ){
- $this->error( wfMsg( 'interwiki_editerror', $prefix ) );
+ $this->error( 'interwiki_editerror', $prefix );
return;
}
$prefix = '<tt>' . htmlspecialchars( $row->iw_prefix ) . '</tt>';
$prefix = $wgRequest->getVal( 'wpInterwikiPrefix' );
$do = $wgRequest->getVal( 'wpInterwikiAction' );
if( preg_match( '/[\s:&=]/', $prefix ) ) {
- $this->error( wfMsg( 'interwiki-badprefix', $prefix ) );
+ $this->error( 'interwiki-badprefix', htmlspecialchars( $prefix ) );
$this->showForm( $do );
return;
}
$dbw->delete( 'interwiki', array( 'iw_prefix' => $prefix ), __METHOD__ );
if ( $dbw->affectedRows() == 0 ) {
- $this->error( wfMsg( 'interwiki_delfailed', $prefix ) );
+ $this->error( 'interwiki_delfailed', $prefix );
$this->showForm( $do );
} else {
$wgOut->addWikiText( wfMsg( 'interwiki_deleted', $prefix ));
}
if( $dbw->affectedRows() == 0 ) {
- $this->error( wfMsg( "interwiki_{$do}failed", $prefix ) );
+ $this->error( "interwiki_{$do}failed", $prefix );
$this->showForm( $do );
} else {
$wgOut->addWikiMsg( "interwiki_{$do}ed", $prefix );
$res = $dbr->select( 'interwiki', '*' );
$numrows = $res->numRows();
if ( $numrows == 0 ) {
- $this->error( wfMsgWikiHtml( 'interwiki_error' ) );
+ $this->error( 'interwiki_error' );
return;
}
$wgOut->addHTML( $out );
}
- function error( $msg ) {
+ function error() {
global $wgOut;
- $wgOut->addHTML( Xml::tags( 'p', array( 'class' => 'error' ), $msg ) );
+ $args = func_get_args();
+ $wgOut->wrapWikiMsg( "<p class='error'>$1</p>", $args );
}
}
'interwiki_addintro' => 'You are adding a new interwiki prefix.
Remember that it cannot contain spaces ( ), colons (:), ampersands (&), or equal signs (=).',
'interwiki_addtext' => 'Add an interwiki prefix',
-'interwiki-badprefix' => '"$1" contains invalid characters',
+'interwiki-badprefix' => 'Specified interwiki prefix "$1" contains invalid characters',
'interwiki_defaultreason' => 'no reason given',
'interwiki_defaulturl' => 'http://www.example.com/$1', # only translate this message to other languages if you have to change it
'interwiki_deleted' => 'Prefix "$1" was successfully removed from the interwiki table.',