From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Thu, 1 Dec 2005 19:09:45 +0000 (+0000)
Subject: * It's not to be expected that when you're viewing the current revision of a
X-Git-Tag: 1.6.0~1085
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=1c2345dcfd4c41b54613c5985fa90e472ed1777c;p=lhc%2Fweb%2Fwiklou.git

* It's not to be expected that when you're viewing the current revision of a
  page that the edit link points to the page as it existed when you loaded it,
  changed it to point to whatever is the latest when the link is followed, like
  it was before. Still uses oldid= on diff views however.
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 7c850c3cdd..b457a82d8f 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1030,7 +1030,9 @@ END;
 	 * @access private
 	 */
 	function editUrlOptions() {
-		if( $this->mRevisionId ) {
+		global $wgArticle;
+		
+		if( $this->mRevisionId && ! $wgArticle->isCurrent() ) {
 			return "action=edit&oldid=" . intval( $this->mRevisionId );
 		} else {
 			return "action=edit";