[phpwiki-checkins] CVS: phpwiki/lib savepage.php,1.19,1.20 Template.php,1.13,1.14

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv18525

Modified Files:
	savepage.php Template.php 
Log Message:
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.)

Index: savepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** savepage.php	2001/12/28 09:53:19	1.19
--- savepage.php	2002/01/05 10:17:07	1.20
***************
*** 85,89 ****
      $template->setPageRevisionTokens($selected);
      $template->replace('FORMVARS', $formvars);
!     $template->replace('PREVIEW_CONTENT', do_transform($request->getArg('content')));
      echo $template->getExpansion();
  }
--- 85,95 ----
      $template->setPageRevisionTokens($selected);
      $template->replace('FORMVARS', $formvars);
! 
!     $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();
  }

Index: Template.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Template.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Template.php	2002/01/05 09:25:37	1.13
--- Template.php	2002/01/05 10:17:07	1.14
***************
*** 247,253 ****
          $this->replace('IS_CURRENT',
  		       $current->getVersion() == $revision->getVersion());
!         $this->replace('EDIT_WARNINGS',
!                        toolbar_Warnings_Edit(!empty($PREVIEW_CONTENT),
!                                              $current->getVersion() == $revision->getVersion()));
  	/*
          if ($previous && $previous->getVersion() != 0)
--- 247,253 ----
          $this->replace('IS_CURRENT',
  		       $current->getVersion() == $revision->getVersion());
! //        $this->replace('EDIT_WARNINGS',
! //                       toolbar_Warnings_Edit(!empty($PREVIEW_CONTENT),
! //                                             $current->getVersion() == $revision->getVersion()));
  	/*
          if ($previous && $previous->getVersion() != 0)