}
/**
- * Can the extension use wfMsg() to get i18n messages?
+ * Can the extension use the Message class/wfMessage to get i18n-ed messages?
*
* @return bool
*/
$args = array_slice( func_get_args(), 2 );
if ( $this->useMessageCache() ) {
- return wfMsgNoTrans( $key, $args );
+ return wfMessage( $key, $args )->plain();
} else {
return wfMsgReplaceArgs( $fallback, $args );
}
}
echo "</body></html>\n";
- die( 1 );
}
}
public $title, $msg, $params;
/**
- * @todo document
+ * Note: these arguments are keys into wfMessage(), not text!
*
- * Note: these arguments are keys into wfMsg(), not text!
- *
- * @param $title A title
- * @param $msg String|Message . In string form, should be a message key
- * @param $params Array Array to wfMsg()
+ * @param $title string|Message Message key (string) for page title, or a Message object
+ * @param $msg string|Message Message key (string) for error text, or a Message object
+ * @param $params array with parameters to wfMessage()
*/
function __construct( $title, $msg, $params = null ) {
$this->title = $title;
if( $msg instanceof Message ){
parent::__construct( $msg );
} else {
- parent::__construct( wfMsg( $msg ) );
+ parent::__construct( wfMessage( $msg )->text() );
}
}
* @ingroup Exception
*/
class BadTitleError extends ErrorPageError {
-
/**
- * @param $msg string A message key (default: 'badtitletext')
- * @param $params Array parameter to wfMsg()
+ * @param $msg string|Message A message key (default: 'badtitletext')
+ * @param $params Array parameter to wfMessage()
*/
function __construct( $msg = 'badtitletext', $params = null ) {
parent::__construct( 'badtitle', $msg, $params );
$reason = $block->mReason;
if( $reason == '' ) {
- $reason = wfMsg( 'blockednoreason' );
+ $reason = wfMessage( 'blockednoreason' )->text();
}
/* $ip returns who *is* being blocked, $intended contains who was meant to be blocked.
/**
* Shows a generic "user is not logged in" error page.
*
- * This is essentially an ErrorPageError exception which by default use the
+ * This is essentially an ErrorPageError exception which by default uses the
* 'exception-nologin' as a title and 'exception-nologin-text' for the message.
* @see bug 37627
* @since 1.20
*
* @par Example:
* @code
- * if( $user->isAnon ) {
+ * if( $user->isAnon() ) {
* throw new UserNotLoggedIn();
* }
* @endcode
*
- * Please note the parameters are mixed up compared to ErrorPageError, this
- * is done to be able to simply specify a reason whitout overriding the default
- * title.
+ * Note the parameter order differs from ErrorPageError, this allows you to
+ * simply specify a reason without overriding the default title.
*
* @par Example:
* @code
- * if( $user->isAnon ) {
+ * if( $user->isAnon() ) {
* throw new UserNotLoggedIn( 'action-require-loggedin' );
* }
* @endcode
* Optional, default: 'exception-nologin-text'
* @param $titleMsg A message key to set the page title.
* Optional, default: 'exception-nologin'
- * @param $params Parameters to wfMsg().
- * Optiona, default: null
+ * @param $params Parameters to wfMessage().
+ * Optional, default: null
*/
public function __construct(
$reasonMsg = 'exception-nologin-text',
if ( $cmdLine ) {
self::printError( $message );
} else {
- self::escapeEchoAndDie( $message );
+ echo nl2br( htmlspecialchars( $message ) ) . "\n";
}
}
} else {
if ( $cmdLine ) {
self::printError( $message );
} else {
- self::escapeEchoAndDie( $message );
+ echo nl2br( htmlspecialchars( $message ) ) . "\n";
}
}
}
}
}
- /**
- * Print a message after escaping it and converting newlines to <br>
- * Use this for non-command line failures.
- *
- * @param $message string Failure text
- */
- private static function escapeEchoAndDie( $message ) {
- echo nl2br( htmlspecialchars( $message ) ) . "\n";
- die(1);
- }
-
/**
* Exception handler which simulates the appropriate catch() handling:
*