Correctly parse interface messages as such, so it doesn't get converted according...

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 90434a4..43fe1a4 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -228,11 +228,13 @@ class EditPage {
                                        $undotext = $this->mArticle->getUndoText( $undorev, $oldrev );
                                        if ( $undotext === false ) {
                                                # Warn the user that something went wrong
-                                               $this->editFormPageTop .= $wgOut->parse( '<div class="error mw-undo-failure">' . wfMsgNoTrans( 'undo-failure' ) . '</div>' );
+                                               $this->editFormPageTop .= $wgOut->parse( '<div class="error mw-undo-failure">' .
+                                                       wfMsgNoTrans( 'undo-failure' ) . '</div>', true, /* interface */true );
                                        } else {
                                                $text = $undotext;
                                                # Inform the user of our success and set an automatic edit summary
-                                               $this->editFormPageTop .= $wgOut->parse( '<div class="mw-undo-success">' . wfMsgNoTrans( 'undo-success' ) . '</div>' );
+                                               $this->editFormPageTop .= $wgOut->parse( '<div class="mw-undo-success">' .
+                                                       wfMsgNoTrans( 'undo-success' ) . '</div>', true, /* interface */true );
                                                $firstrev = $oldrev->getNext();
                                                # If we just undid one rev, use an autosummary
                                                if ( $firstrev->mId == $undo ) {
@@ -245,7 +247,8 @@ class EditPage {
                                        // Failed basic sanity checks.
                                        // Older revisions may have been removed since the link
                                        // was created, or we may simply have got bogus input.
-                                       $this->editFormPageTop .= $wgOut->parse( '<div class="error mw-undo-norev">' . wfMsgNoTrans( 'undo-norev' ) . '</div>' );
+                                       $this->editFormPageTop .= $wgOut->parse( '<div class="error mw-undo-norev">' .
+                                               wfMsgNoTrans( 'undo-norev' ) . '</div>'true, /* interface */true );
                                }
                        } elseif ( $section != '' ) {
                                if ( $section == 'new' ) {
@@ -2080,7 +2083,7 @@ HTML
                                // string, which happens when you initially edit
                                // a category page, due to automatic preview-on-open.
                                $parsedNote = $wgOut->parse( "<div class='previewnote'>" .
-                                       wfMsg( 'session_fail_preview_html' ) . "</div>" );
+                                       wfMsg( 'session_fail_preview_html' ) . "</div>", true, /* interface */true );
                        }
                        wfProfileOut( __METHOD__ );
                        return $parsedNote;
@@ -2154,7 +2157,7 @@ HTML
 
                $previewhead = "<div class='previewnote'>\n" .
                        '<h2 id="mw-previewheader">' . htmlspecialchars( wfMsg( 'preview' ) ) . "</h2>" .
-                       $wgOut->parse( $note ) . $conflict . "</div>\n";
+                       $wgOut->parse( $note, true, /* interface */true ) . $conflict . "</div>\n";
 
                $pageLang = $this->mTitle->getPageLanguage();
                $attribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir(),

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index e81ec92..b4f56b5 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1459,7 +1459,8 @@ class OutputPage extends ContextSource {
         * @param $linestart Boolean: is this the start of a line?
         * @param $interface Boolean: use interface language ($wgLang instead of
         *                   $wgContLang) while parsing language sensitive magic
-        *                   words like GRAMMAR and PLURAL
+        *                   words like GRAMMAR and PLURAL. This also disables
+        *                                       LanguageConverter.
         * @param $language  Language object: target language object, will override
         *                   $interface
         * @return String: HTML