* (bug 35014) Fix for r100529: including a special page no longer sets the page's...

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index df75054..3bbb097 100644 (file)
--- 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 6c76ae1..bb02c01 100644 (file)
--- 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() );
        }
 
        /**