From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 7 Jun 2006 08:28:43 +0000 (+0000)
Subject: * Regression fix: suppress warning about session failure when clicking to
X-Git-Tag: 1.31.0-rc.0~56851
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=263dc95a701ef787b4756e3628628605d47eb7c0;p=lhc%2Fweb%2Fwiklou.git

* Regression fix: suppress warning about session failure when clicking to
  edit with 'preview on first edit' enabled.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bb1457fc8b..9ad6b40cd4 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -454,6 +454,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   meta robots tag on diff view and special pages. Should reduce impact of
   robots on scrolling special pages, diffs etc on sites where robots.txt
   doesn't forbid access.
+* Regression fix: suppress warning about session failure when clicking to
+  edit with 'preview on first edit' enabled.
 
 
 == Compatibility ==
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 461403da43..9a1922517c 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -24,6 +24,7 @@ class EditPage {
 	var $firsttime;
 	var $lastDelete;
 	var $mTokenOk = false;
+	var $mTriedSave = false;
 	var $tooBig = false;
 	var $kblength = false;
 	var $missingComment = false;
@@ -358,6 +359,10 @@ class EditPage {
 				$this->preview = $request->getCheck( 'wpPreview' ) || $request->getCheck( 'wpLivePreview' );
 				$this->diff = $request->getCheck( 'wpDiff' );
 
+				// Remember whether a save was requested, so we can indicate
+				// if we forced preview due to session failure.
+				$this->mTriedSave = !$this->preview;
+				
 				if ( $this->tokenOk( $request ) ) {
 					# Some browsers will not report any submit button
 					# if the user hits enter in the comment box.
@@ -1260,10 +1265,10 @@ END
 		$fname = 'EditPage::getPreviewText';
 		wfProfileIn( $fname );
 
-		if ( $this->mTokenOk ) {
-			$msg = 'previewnote';
-		} else {
+		if ( $this->mTriedSave && !$this->mTokenOk ) {
 			$msg = 'session_fail_preview';
+		} else {
+			$msg = 'previewnote';
 		}
 		$previewhead = '<h2>' . htmlspecialchars( wfMsg( 'preview' ) ) . "</h2>\n" .
 			"<div class='previewnote'>" . $wgOut->parse( wfMsg( $msg ) ) . "</div>\n";