* (bug 2514) Reverting the change to setSubtitle(), now uses raw HTML again

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index adcdcde..f45092b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -331,11 +331,9 @@ Various bugfixes, small features, and a few experimental things:
 * Fixed a typo in the Romanian language file (NS_MESIA => NS_MEDIA)
 * (bug 2504) Updated the Finnish translation
 * (bug 2506) Updated the Nynorsk translation
-* Everything given to setSubtitle() is now parsed for the full wikisyntax
 * (bug 996) Replace $wgWhitelistEdit with 'edit' permission; fixup UPGRADE
   documentation about edit and read whitelists.
 
-
 === Caveats ===
 
 Some output, particularly involving user-supplied inline HTML, may not

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index bb093cf..43e9ba2 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -170,7 +170,7 @@ class OutputPage {
        }
        function getHTMLTitle() { return $this->mHTMLtitle; }
        function getPageTitle() { return $this->mPagetitle; }
-       function setSubtitle( $str ) { $this->mSubtitle = $this->parse($str); }
+       function setSubtitle( $str ) { $this->mSubtitle = /*$this->parse(*/$str/*)*/; } // @bug 2514
        function getSubtitle() { return $this->mSubtitle; }
        function isArticle() { return $this->mIsarticle; }
        function setPrintable() { $this->mPrintable = true; }