diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-01-18 16:46:04 +0100 |
commit | 63601400e476c6cf43d985f3e7b9864681695ed4 (patch) | |
tree | f7846203a952e38aaf66989d0a4702779f549962 /includes/WikiError.php | |
parent | 8ff01378c9e0207f9169b81966a51def645b6a51 (diff) |
Update to MediaWiki 1.20.2
this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'includes/WikiError.php')
-rw-r--r-- | includes/WikiError.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/includes/WikiError.php b/includes/WikiError.php index 7c167f61..45ee20c9 100644 --- a/includes/WikiError.php +++ b/includes/WikiError.php @@ -91,22 +91,22 @@ class WikiErrorMsg extends WikiError { wfDeprecated( __METHOD__, '1.17' ); $args = func_get_args(); array_shift( $args ); - $this->mMessage = wfMsgReal( $message, $args, true ); + $this->mMessage = wfMessage( $message )->rawParams( $args )->text(); $this->mMsgKey = $message; $this->mMsgArgs = $args; } - + function getMessageKey() { return $this->mMsgKey; } - + function getMessageArgs() { return $this->mMsgArgs; } } /** - * Error class designed to handle errors involved with + * Error class designed to handle errors involved with * XML parsing * @ingroup Exception */ @@ -134,12 +134,12 @@ class WikiXmlError extends WikiError { /** @return string */ function getMessage() { // '$1 at line $2, col $3 (byte $4): $5', - return wfMsgHtml( 'xml-error-string', + return wfMessage( 'xml-error-string', $this->mMessage, $this->mLine, $this->mColumn, $this->mByte . $this->mContext, - xml_error_string( $this->mXmlError ) ); + xml_error_string( $this->mXmlError ) )->escaped(); } function _extractContext( $context, $offset ) { |