From: Brian Wolff <bawolff+wn@gmail.com>
Date: Wed, 18 Oct 2017 06:27:12 +0000 (+0000)
Subject: Fix html <title> for exceptions during message parsing.
X-Git-Tag: 1.34.0-rc.0~4102^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=bbcbcaba3db9e1221a5dfe6ce0f1a7f9aa19deb0;p=lhc%2Fweb%2Fwiklou.git

Fix html <title> for exceptions during message parsing.

Previously an ugly {{SITENAME}} would show up for exceptions
that happened in the middle of processing a message

Change-Id: I4e3b675673dc3b74f89e4325f6a0a8b44162f478
---

diff --git a/includes/exception/MWException.php b/includes/exception/MWException.php
index b3e9422b8d..652a87dcfc 100644
--- a/includes/exception/MWException.php
+++ b/includes/exception/MWException.php
@@ -73,15 +73,23 @@ class MWException extends Exception {
 	 * @return string Message with arguments replaced
 	 */
 	public function msg( $key, $fallback /*[, params...] */ ) {
+		global $wgSitename;
 		$args = array_slice( func_get_args(), 2 );
 
+		$res = false;
 		if ( $this->useMessageCache() ) {
 			try {
-				return wfMessage( $key, $args )->text();
+				$res = wfMessage( $key, $args )->text();
 			} catch ( Exception $e ) {
 			}
 		}
-		return wfMsgReplaceArgs( $fallback, $args );
+		if ( $res === false ) {
+			$res = wfMsgReplaceArgs( $fallback, $args );
+			// If an exception happens inside message rendering,
+			// {{SITENAME}} sometimes won't be replaced.
+			$res = preg_replace( '/\{\{SITENAME\}\}/', $wgSitename, $res );
+		}
+		return $res;
 	}
 
 	/**
@@ -154,6 +162,16 @@ class MWException extends Exception {
 		global $wgOut, $wgSitename;
 		if ( $this->useOutputPage() ) {
 			$wgOut->prepareErrorPage( $this->getPageTitle() );
+			// Manually set the html title, since sometimes
+			// {{SITENAME}} does not get replaced for exceptions
+			// happening inside message rendering.
+			$wgOut->setHTMLTitle(
+				$this->msg(
+					'pagetitle',
+					"$1 - $wgSitename",
+					$this->getPageTitle()
+				)
+			);
 
 			$wgOut->addHTML( $this->getHTML() );
 
diff --git a/includes/exception/MWExceptionRenderer.php b/includes/exception/MWExceptionRenderer.php
index 49cf71e624..1f1cabeae1 100644
--- a/includes/exception/MWExceptionRenderer.php
+++ b/includes/exception/MWExceptionRenderer.php
@@ -197,12 +197,17 @@ class MWExceptionRenderer {
 	 * @return string Message with arguments replaced
 	 */
 	private static function msg( $key, $fallback /*[, params...] */ ) {
+		global $wgSitename;
 		$args = array_slice( func_get_args(), 2 );
 		try {
-			return wfMessage( $key, $args )->text();
+			$res = wfMessage( $key, $args )->text();
 		} catch ( Exception $e ) {
-			return wfMsgReplaceArgs( $fallback, $args );
+			$res = wfMsgReplaceArgs( $fallback, $args );
+			// If an exception happens inside message rendering,
+			// {{SITENAME}} sometimes won't be replaced.
+			$res = preg_replace( '/\{\{SITENAME\}\}/', $wgSitename, $res );
 		}
+		return $res;
 	}
 
 	/**