From 45592ea5c77ce5a68df6984a2e5c1ac217f64aa8 Mon Sep 17 00:00:00 2001 From: carstenklapp Date: Sat, 5 Jan 2002 10:17:07 +0000 Subject: [PATCH] Fixes a missing "Warning: You are editing an old revision..." message when previewing. (Not sure whether my last Toolbar.php / editpage.html commit broke this or if it was already broken.) git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@1025 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/Template.php | 8 ++++---- lib/savepage.php | 10 ++++++++-- templates/editpage.html | 5 ++++- themes/MacOSX/templates/editpage.html | 12 ++---------- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/lib/Template.php b/lib/Template.php index f40ae0a4f..9209af001 100644 --- a/lib/Template.php +++ b/lib/Template.php @@ -1,4 +1,4 @@ -getVersion() == $revision->getVersion(),$page->getName())); $this->replace('IS_CURRENT', $current->getVersion() == $revision->getVersion()); - $this->replace('EDIT_WARNINGS', - toolbar_Warnings_Edit(!empty($PREVIEW_CONTENT), - $current->getVersion() == $revision->getVersion())); +// $this->replace('EDIT_WARNINGS', +// toolbar_Warnings_Edit(!empty($PREVIEW_CONTENT), +// $current->getVersion() == $revision->getVersion())); /* if ($previous && $previous->getVersion() != 0) $this->setConditional('COPY'); // FIXME: should rename HAVE_COPY? diff --git a/lib/savepage.php b/lib/savepage.php index 669f70764..031c0d1a6 100644 --- a/lib/savepage.php +++ b/lib/savepage.php @@ -1,4 +1,4 @@ -setPageRevisionTokens($selected); $template->replace('FORMVARS', $formvars); - $template->replace('PREVIEW_CONTENT', do_transform($request->getArg('content'))); + + $PREVIEW_CONTENT= do_transform($request->getArg('content')); + $template->replace('PREVIEW_CONTENT',$PREVIEW_CONTENT); + $template->replace('EDIT_WARNINGS', + toolbar_Warnings_Edit(!empty($PREVIEW_CONTENT), + $version == $request->getArg('editversion'))); + echo $template->getExpansion(); } diff --git a/templates/editpage.html b/templates/editpage.html index bf0f69ca0..ec54030b1 100644 --- a/templates/editpage.html +++ b/templates/editpage.html @@ -4,7 +4,7 @@ @@ -19,6 +19,9 @@ ${CSS}

${PAGE}"); ?>

${EDIT_WARNINGS} + +
${PREVIEW_CONTENT}
+ @@ -18,18 +18,10 @@ ${CSS}

${PAGE}"); ?>

+${EDIT_WARNINGS} -

$_("Preview only! Changes not saved.")

${PREVIEW_CONTENT}
-
- - -

$_("Warning: You are editing an old revision.") - $_("Saving this page will overwrite the current version.")

-
- -