(bug 2564) Don't show editingold warning for recent revision

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 163be22..0a39f0f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -417,6 +417,7 @@ Various bugfixes, small features, and a few experimental things:
 * (bug 2591) Check for end, fix limits on Whatlinkshere
 * (bug 2584) Fix output of subcategory list
 * (bug 2597) Don't crash when undeleting an image description page
+* (bug 2564) Don't show "editingold" warning for recent revision
 
 
 === Caveats ===

diff --git a/includes/Article.php b/includes/Article.php
index e1a5ab0..141ce02 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -35,6 +35,7 @@ class Article {
        var $mForUpdate;
        var $mOldId;
        var $mRevIdFetched;
+       var $mRevision;
        /**#@-*/
 
        /**
@@ -431,6 +432,7 @@ class Article {
                
                $this->mRevIdFetched = $revision->getID();
                $this->mContentLoaded = true;
+               $this->mRevision =& $revision;
                
                return $this->mContent;
        }

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 43d9dc5..67408cc 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -495,7 +495,7 @@ class EditPage {
                                $this->mArticle->setOldSubtitle();
                                $wgOut->addWikiText( wfMsg( 'nonunicodebrowser') );
                        }
-                       if ( $this->oldid ) {
+                       if ( !$this->mArticle->mRevision->isCurrent() ) {
                                $this->mArticle->setOldSubtitle();
                                $wgOut->addWikiText( wfMsg( 'editingold' ) );
                        }