[phpwiki-checkins] CVS: phpwiki/lib Template.php,1.15,1.16 savepage.php,1.23,1.24

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
	Template.php savepage.php 
Log Message:
Refactor to eliminate global $thankyou.


Index: Template.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Template.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** Template.php	2002/01/08 00:06:45	1.15
--- Template.php	2002/01/08 00:31:24	1.16
***************
*** 339,345 ****
      if ($page_revision)
          $t->setPageRevisionTokens($page_revision);
-     global $thankyou;
-     if ($thankyou)
-         $t->replace('THANK_YOU', $thankyou);
      $t->replace('CONTENT', $content);
      $t->replace('TITLE', $title);
--- 339,342 ----

Index: savepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** savepage.php	2002/01/08 00:12:26	1.23
--- savepage.php	2002/01/08 00:31:24	1.24
***************
*** 149,166 ****
                                           ExtractWikiPageLinks($content));
  
!     // This should be refactored to avoid a global, for now it allows
!     // the actual messages to be moved away from this page. $thankyou is
!     // required in the GeneratePage() function.
!     global $thankyou;
  
!     if (!is_object($newrevision)) {
!         // Save failed.
!         $thankyou = ConcurrentUpdates($pagename);
!         $thankyou .= "<hr noshade=\"noshade\" />";
!         $html = do_transform($current->getContent());
!         echo GeneratePage('BROWSE', $html, $pagename, $current);
  
-     } else {
-     
          // Clean out archived versions of this page.
          $cleaner = new ArchiveCleaner($GLOBALS['ExpireParams']);
--- 149,158 ----
                                           ExtractWikiPageLinks($content));
  
!     $template = new WikiTemplate('BROWSE');
!     $template->replace('TITLE', $pagename);
  
!     if (is_object($newrevision)) {
!         // New contents successfully saved...
  
          // Clean out archived versions of this page.
          $cleaner = new ArchiveCleaner($GLOBALS['ExpireParams']);
***************
*** 177,186 ****
              }
          }
!         $thankyou = toolbar_Info_ThankYou($pagename, $warnings);
!         $html = do_transform($newrevision->getContent());
!         echo GeneratePage('BROWSE', $html, $pagename, $newrevision);
      }
- 
  
  }
  
--- 169,187 ----
              }
          }
!         
!         $template->replace('THANK_YOU',
!                            toolbar_Info_ThankYou($pagename, $warnings));
!     } else {
!         // Save failed.
!         // (This is a bit kludgy...)
!         $template->replace('THANK_YOU',
!                            ConcurrentUpdates($pagename)
!                            . "<hr noshade=\"noshade\" />");
!         $newrevision = $current;
      }
  
+     $template->setPageRevisionTokens($newrevision);
+     $template->replace('CONTENT', do_transform($newrevision->getContent()));
+     echo $template->getExpansion();
  }