* 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 bb1457f..9ad6b40 100644 (file)
--- 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 461403d..9a19225 100644 (file)
--- 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";