From: Jens Frank <jeluf@users.mediawiki.org>
Date: Wed, 29 Jun 2005 05:15:32 +0000 (+0000)
Subject: (bug 2564) Don't show editingold warning for recent revision
X-Git-Tag: 1.5.0beta2~133
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/%7B%24conf-%3EScriptPath%7D/index.php?a=commitdiff_plain;h=04b5f9ec0f5d9dfe6d3a987614e4c5a56f5ef621;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 163be2210a..0a39f0f203 100644
--- 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 e1a5ab01f4..141ce0242e 100644
--- 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 43d9dc55bc..67408cc2ee 100644
--- 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' ) );
 			}