* (Bug 13828) Split parameter $1 (combines title and revision numbers) of MediaWiki...

  and $2 (=revision numbers) for prettier output.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3ae945a..898af8c 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -341,6 +341,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 10080) Users can now modify an existing block without unblocking first.
 * (bug 12859) $wgRateLimitsExcludedGroups has been deprecated in favor of
   $wgGroupPermissions[]['noratelimit']. 
+* (Bug 13828) Split parameter $1 of MediaWiki:Missingarticle into $1 (=title)
+  and $2 (=revision numbers)
 
 === API changes in 1.13 ===
 

diff --git a/includes/Article.php b/includes/Article.php
index 773e3aa..d709f62 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -395,10 +395,8 @@ class Article {
                # Pre-fill content with error message so that if something
                # fails we'll have something telling us what we intended.
                $t = $this->mTitle->getPrefixedText();
-               if( $oldid ) {
-                       $t .= ' ' . wfMsgExt( 'missingarticle-rev', array( 'escape' ), $oldid );
-               }
-               $this->mContent = wfMsg( 'missingarticle', $t ) ;
+               $d = $oldid ? wfMsgExt( 'missingarticle-rev', array( 'escape' ), $oldid ) : '';
+               $this->mContent = wfMsg( 'missing-article', $t, $d ) ;
 
                if( $oldid ) {
                        $revision = Revision::newFromId( $oldid );
@@ -803,8 +801,8 @@ class Article {
                                # Failed to load, replace text with error message
                                $t = $this->mTitle->getPrefixedText();
                                if( $oldid ) {
-                                       $t .= ' ' . wfMsgExt( 'missingarticle-rev', array( 'escape' ), $oldid );
-                                       $text = wfMsg( 'missingarticle', $t );
+                                       $d = wfMsgExt( 'missingarticle-rev', array( 'escape' ), $oldid );
+                                       $text = wfMsg( 'missing-article', $t, $d );
                                } else {
                                        $text = wfMsg( 'noarticletext' );
                                }

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index 02a978e..1affe45 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -112,9 +112,10 @@ CONTROL;
 
                $wgOut->setArticleFlag( false );
                if ( ! $this->loadRevisionData() ) {
-                       $t = $this->mTitle->getPrefixedText() . ' ' . wfMsgExt( 'missingarticle-diff', array( 'escape' ), $this->mOldid, $this->mNewid );
+                       $t = $this->mTitle->getPrefixedText();
+                       $d = wfMsgExt( 'missingarticle-diff', array( 'escape' ), $this->mOldid, $this->mNewid );
                        $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) );
-                       $wgOut->addWikiMsg( 'missingarticle', "<nowiki>$t</nowiki>" );
+                       $wgOut->addWikiMsg( 'missing-article', "<nowiki>$t</nowiki>", $d );
                        wfProfileOut( __METHOD__ );
                        return;
                }
@@ -333,9 +334,10 @@ CONTROL;
                # Get article text from the DB
                #
                if ( ! $this->loadNewText() ) {
-                       $t = $this->mTitle->getPrefixedText() . ' ' . wfMsgExt( 'missingarticle-diff', array( 'escape' ), $this->mOldid, $this->mNewid );
+                       $t = $this->mTitle->getPrefixedText();
+                       $d = wfMsgExt( 'missingarticle-diff', array( 'escape' ), $this->mOldid, $this->mNewid );
                        $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) );
-                       $wgOut->addWikiMsg( 'missingarticle', "<nowiki>$t</nowiki>" );
+                       $wgOut->addWikiMsg( 'missing-article', "<nowiki>$t</nowiki>", $d );
                        wfProfileOut( __METHOD__ );
                        return;
                }
@@ -378,7 +380,7 @@ CONTROL;
                global $wgOut;
                $diff = $this->getDiff( $otitle, $ntitle );
                if ( $diff === false ) {
-                       $wgOut->addWikiMsg( 'missingarticle', "<nowiki>(fixme, bug)</nowiki>" );
+                       $wgOut->addWikiMsg( 'missing-article', "<nowiki>(fixme, bug)</nowiki>", '' );
                        return false;
                } else {
                        $this->showDiffStyle();

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index ccd1ca9..cfa1d52 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -479,7 +479,7 @@ MySQL meldete den Fehler: „<tt>$3: $4</tt>“.',
 'readonlytext'         => 'Die Datenbank ist vorübergehend für Neueinträge und Änderungen gesperrt. Bitte versuche es später noch einmal.
 
 Grund der Sperrung: $1',
-'missingarticle'       => 'Der Text für „$1“ wurde nicht in der Datenbank gefunden.
+'missing-article'      => 'Der Text für „$1“ $2 wurde nicht in der Datenbank gefunden.
 
 Die Seite ist möglicherweise gelöscht oder verschoben worden.
 

diff --git a/languages/messages/MessagesDe_formal.php b/languages/messages/MessagesDe_formal.php
index 87d784b..529f655 100644 (file)
--- a/languages/messages/MessagesDe_formal.php
+++ b/languages/messages/MessagesDe_formal.php
@@ -34,7 +34,7 @@ $messages = array(
 'readonlytext'         => 'Die Datenbank ist vorübergehend für Neueinträge und Änderungen gesperrt. Bitte versuchen Sie es später noch einmal.
 
 Grund der Sperrung: $1',
-'missingarticle'       => 'Der Text für „$1“ wurde nicht in der Datenbank gefunden.
+'missing-article'      => 'Der Text für „$1“ $2 wurde nicht in der Datenbank gefunden.
 
 Die Seite ist möglicherweise gelöscht oder verschoben worden.
 

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 70c195b..3ecea9d 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -785,7 +785,7 @@ $1',
 'readonlytext'         => 'The database is currently locked to new entries and other modifications, probably for routine database maintenance, after which it will be back to normal.
 
 The administrator who locked it offered this explanation: $1',
-'missingarticle'       => 'The database did not find the text of a page that it should have found, named "$1".
+'missing-article'      => 'The database did not find the text of a page that it should have found, named "$1" $2.
 
 This is usually caused by following an outdated diff or history link to a page that has been deleted.
 

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 5b22545..bfec724 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -319,7 +319,7 @@ $wgMessageStructure = array(
                'readonly',
                'enterlockreason',
                'readonlytext',
-               'missingarticle',
+               'missing-article',
                'missingarticle-rev',
                'missingarticle-diff',
                'readonly_lag',