X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Ftitle%2FMalformedTitleException.php;h=5b8b643062e43c5c1e33c639f453acdebcf68c0c;hb=db54a16e19e79de4f671ae1bc749e220f4c5e224;hp=e7477781b782c5a6f61e6117da070142c6b76dfc;hpb=e4af020f0ee4d599be229c6d3a32b48a4b52a69c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/title/MalformedTitleException.php b/includes/title/MalformedTitleException.php
index e7477781b7..5b8b643062 100644
--- a/includes/title/MalformedTitleException.php
+++ b/includes/title/MalformedTitleException.php
@@ -30,12 +30,23 @@ class MalformedTitleException extends Exception {
 	/**
 	 * @param string $errorMessage Localisation message describing the error (since MW 1.26)
 	 * @param string $titleText The invalid title text (since MW 1.26)
-	 * @param string[] $errorMessageParameters Additional parameters for the error message (since MW 1.26)
+	 * @param string[] $errorMessageParameters Additional parameters for the error message.
+	 * $titleText will be appended if it's not null. (since MW 1.26)
 	 */
-	public function __construct( $errorMessage = null, $titleText = null, $errorMessageParameters = array() ) {
+	public function __construct(
+		$errorMessage = null, $titleText = null, $errorMessageParameters = array()
+	) {
 		$this->errorMessage = $errorMessage;
 		$this->titleText = $titleText;
+		if ( $titleText !== null ) {
+			$errorMessageParameters[] = $titleText;
+		}
 		$this->errorMessageParameters = $errorMessageParameters;
+
+		// Supply something useful for Exception::getMessage() to return.
+		$enMsg = wfMessage( $errorMessage, $errorMessageParameters );
+		$enMsg->inLanguage( 'en' )->useDatabase( false );
+		parent::__construct( $enMsg->text() );
 	}
 
 	/**
@@ -45,7 +56,7 @@ class MalformedTitleException extends Exception {
 	public function getTitleText() {
 		return $this->titleText;
 	}
-	
+
 	/**
 	 * @since 1.26
 	 * @return string|null
@@ -53,7 +64,7 @@ class MalformedTitleException extends Exception {
 	public function getErrorMessage() {
 		return $this->errorMessage;
 	}
-	
+
 	/**
 	 * @since 1.26
 	 * @return string[]