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

Revert r66934 (Removing wfLoadExtensionMessages() from everything). I disagree on principle...we branch extensions for this very reason. But people want trunk extensions compatible for several versions back, meh.

Browse source
This commit is contained in:
Chad Horohoe 2010-05-27 15:56:53 +00:00
parent 69251815ff
commit 85c4e63e2a
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
TitleBlacklist.hooks.php
View file

@ -19,6 +19,7 @@ class TitleBlacklistHooks {
efInitTitleBlacklist(); efInitTitleBlacklist();
$blacklisted = $wgTitleBlacklist->isBlacklisted( $title, $action ); $blacklisted = $wgTitleBlacklist->isBlacklisted( $title, $action );
if( $blacklisted instanceof TitleBlacklistEntry ) { if( $blacklisted instanceof TitleBlacklistEntry ) {
wfLoadExtensionMessages( 'TitleBlacklist' );
$message = $blacklisted->getCustomMessage(); $message = $blacklisted->getCustomMessage();
if( is_null( $message ) ) if( is_null( $message ) )
$message = 'titleblacklist-forbidden-edit'; $message = 'titleblacklist-forbidden-edit';
@ -39,6 +40,7 @@ class TitleBlacklistHooks {
if( !$blacklisted ) if( !$blacklisted )
$blacklisted = $wgTitleBlacklist->isBlacklisted( $old, 'edit' ); $blacklisted = $wgTitleBlacklist->isBlacklisted( $old, 'edit' );
if( $blacklisted instanceof TitleBlacklistEntry ) { if( $blacklisted instanceof TitleBlacklistEntry ) {
wfLoadExtensionMessages( 'TitleBlacklist' );
$message = $blacklisted->getCustomMessage(); $message = $blacklisted->getCustomMessage();
if( is_null( $message ) ) if( is_null( $message ) )
$message = 'titleblacklist-forbidden-move'; $message = 'titleblacklist-forbidden-move';
@ -63,6 +65,7 @@ class TitleBlacklistHooks {
if( !( $blacklisted instanceof TitleBlacklistEntry ) ) if( !( $blacklisted instanceof TitleBlacklistEntry ) )
$blacklisted = $wgTitleBlacklist->isBlacklisted( $title, 'create' ); $blacklisted = $wgTitleBlacklist->isBlacklisted( $title, 'create' );
if( $blacklisted instanceof TitleBlacklistEntry ) { if( $blacklisted instanceof TitleBlacklistEntry ) {
wfLoadExtensionMessages( 'TitleBlacklist' );
$message = $blacklisted->getCustomMessage(); $message = $blacklisted->getCustomMessage();
if( is_null( $message ) ) if( is_null( $message ) )
$message = wfMsgWikiHtml( 'titleblacklist-forbidden-new-account', $message = wfMsgWikiHtml( 'titleblacklist-forbidden-new-account',
@ -89,6 +92,7 @@ class TitleBlacklistHooks {
return true; return true;
} }
wfLoadExtensionMessages( 'TitleBlacklist' );
$errmsg = wfMsgExt( 'titleblacklist-invalid', array( 'parsemag' ), count( $ok ) ); $errmsg = wfMsgExt( 'titleblacklist-invalid', array( 'parsemag' ), count( $ok ) );
$errlines = '* <tt>' . implode( "</tt>\n* <tt>", array_map( 'wfEscapeWikiText', $ok ) ) . '</tt>'; $errlines = '* <tt>' . implode( "</tt>\n* <tt>", array_map( 'wfEscapeWikiText', $ok ) ) . '</tt>';
$error = '<div class="errorbox">' . $error = '<div class="errorbox">' .
@ -106,6 +110,7 @@ class TitleBlacklistHooks {
if ( $retitle !== null && !$retitle->exists() ) { if ( $retitle !== null && !$retitle->exists() ) {
$blacklisted = $wgTitleBlacklist->isBlacklisted( $retitle, 'create' ); $blacklisted = $wgTitleBlacklist->isBlacklisted( $retitle, 'create' );
if ( $blacklisted instanceof TitleBlacklistEntry ) { if ( $blacklisted instanceof TitleBlacklistEntry ) {
wfLoadExtensionMessages( 'TitleBlacklist' );
$error = ( '<div class="errorbox">' . $error = ( '<div class="errorbox">' .
wfMsg( 'titleblacklist-forbidden-edit', wfMsg( 'titleblacklist-forbidden-edit',
htmlspecialchars( $blacklisted->getRaw() ), htmlspecialchars( $blacklisted->getRaw() ),