When the token is lost, reopen edit form rather than abort.

git-svn-id: svn://pmwiki.org/pmwiki/trunk@4473 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 6 insertions, 2 deletions

diff --git a/pmwiki.php b/pmwiki.php
index 685e3c12..3cee35c8 100644
--- a/pmwiki.php
+++ b/pmwiki.php
@@ -2722,7 +2722,8 @@ function PreviewPage($pagename,&$page,&$new) {
 
 function HandleEdit($pagename, $auth = 'edit') {
   global $IsPagePosted, $EditFields, $EnablePost, $FmtV, $Now, $EditRedirectFmt,
-    $PageEditForm, $HandleEditFmt, $PageStartFmt, $PageEditFmt, $PageEndFmt;
+    $PageEditForm, $HandleEditFmt, $PageStartFmt, $PageEditFmt, $PageEndFmt, 
+    $MessagesFmt;
   SDV($EditRedirectFmt, '$FullName');
   if (@$_POST['cancel']) 
     { Redirect(FmtPageName($EditRedirectFmt, $pagename)); return; }
@@ -2734,7 +2735,10 @@ function HandleEdit($pagename, $auth = 'edit') {
     if (isset($_POST[$k])) $new[$k]=str_replace("\r",'',stripmagic($_POST[$k]));
 
   $EnablePost &= (bool)preg_grep('/^post/', array_keys(@$_POST));
-  if($EnablePost) pmtoken(1, true);
+  if ($EnablePost && !pmtoken(1)) {
+    $MessagesFmt[] = '$[Token invalid or missing]';
+    $EnablePost = false;
+  }
   $new['=preview'] = @$new['text'];
   PCache($pagename, $new);
   UpdatePage($pagename, $page, $new);