(bug 9339) Use wfMsgExt() in OutputPage::showErrorPage() to avoid the old issue with...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0cfc6ac..f3e769b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -394,6 +394,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7890) Don't list redirects to special pages in Special:BrokenRedirects
 * (bug 10783) Resizing PNG-24 images causes all alpha channel transparency to be
   lost and transparent pixels to be turned black
+* (bug 9339) General error pages were transforming messages and their parameters
+  in the wrong order
 
 == API changes since 1.10 ==
 

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index ae68f63..66fbb8d 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -822,9 +822,9 @@ class OutputPage {
                $this->mRedirect = '';
                $this->mBodytext = '';
                
+               array_unshift( $params, 'parse' );
                array_unshift( $params, $msg );
-               $message = call_user_func_array( 'wfMsg', $params );
-               $this->addWikiText( $message );
+               $this->addHtml( call_user_func_array( 'wfMsgExt', $params ) );
                
                $this->returnToMain( false );
        }