From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 8 Mar 2012 20:06:49 +0000 (+0000)
Subject: * (bug 35014) Fix for r100529: including a special page no longer sets the page's... 
X-Git-Tag: 1.31.0-rc.0~24333
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=71836d664325ff4421a42a320d42fa220b49d82d;p=lhc%2Fweb%2Fwiklou.git

* (bug 35014) Fix for r100529: including a special page no longer sets the page's title to the included page
---

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index df75054466..3bbb097cb3 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -11,6 +11,10 @@ This is a beta release of the MediaWiki 1.19 branch. Please test it and let us
 know what you think of it. Beta releases are not recommended for use in
 production.
 
+=== Changes since 1.19 beta 1 ===
+* (bug 35014) Including a special page no longer sets the page's title to the
+  included page
+
 === Configuration changes in 1.19 ===
 * Removed SkinTemplateSetupPageCss hook; use BeforePageDisplay instead.
 * (bug 27132) movefile right granted by default to registered users.
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 6c76ae1c29..bb02c0118c 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -3433,7 +3433,7 @@ $templates
 	 * @param $args array
 	 */
 	public function addWikiMsgArray( $name, $args ) {
-		$this->addWikiText( $this->msg( $name, $args )->plain() );
+		$this->addHTML( $this->msg( $name, $args )->parseAsBlock() );
 	}
 
 	/**