From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Sat, 6 Oct 2012 15:28:09 +0000 (+0200)
Subject: Use parseAsBlock() instead of parse() to show the error message in OutputPage::showEr... 
X-Git-Tag: 1.31.0-rc.0~22099^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=9c7557faef1b849695745e6f2884c820faffbc56;p=lhc%2Fweb%2Fwiklou.git

Use parseAsBlock() instead of parse() to show the error message in OutputPage::showErrorPage()

When a message name is passed, addWikiMsgArray() is used, so it adds a <p> arround the
result. Do the same when a Message object is passed to that method.

Change-Id: Ie97ad9a921ae3fc6d327531b0ace64b6a08e1fa2
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 02f22d994d..45704bc2da 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2056,7 +2056,7 @@ class OutputPage extends ContextSource {
 		$this->prepareErrorPage( $title );
 
 		if ( $msg instanceof Message ){
-			$this->addHTML( $msg->parse() );
+			$this->addHTML( $msg->parseAsBlock() );
 		} else {
 			$this->addWikiMsgArray( $msg, $params );
 		}