[phpwiki-checkins] CVS: phpwiki/lib ziplib.php,1.24,1.25

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

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

Modified Files:
	ziplib.php 
Log Message:
Reorder of mime $params: pagename & flags to top, charset forced to bottom. This just makes it easy for working on pgsrc files for cvs, it makes one contiguous block to cut unwanted params out of generated pgsrc files before committing to cvs. (charset was somewhat arbitrarily chosen for the bottom line, but it's always present and the last parameter line shouldn't have a trailing semicolon.)

Index: ziplib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/ziplib.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** ziplib.php	2002/01/26 01:51:13	1.24
--- ziplib.php	2002/01/26 07:33:45	1.25
***************
*** 527,535 ****
      // FIXME: add 'hits' to $params 
      $params = array('pagename'     => $page->getName(),
                      'author'       => $revision->get('author'),
                      'version'      => $revision->getVersion(),
!                     'flags'        => "",
!                     'lastmodified' => $revision->get('mtime'),
!                     'charset'	   => CHARSET);
  
      
--- 527,534 ----
      // FIXME: add 'hits' to $params 
      $params = array('pagename'     => $page->getName(),
+                     'flags'        => "",
                      'author'       => $revision->get('author'),
                      'version'      => $revision->getVersion(),
!                     'lastmodified' => $revision->get('mtime'));
  
      
***************
*** 542,546 ****
      if ($revision->get('markup'))
          $params['markup'] = $revision->get('markup');
!     
  
      // Non-US-ASCII is not allowed in Mime headers (at least not without
--- 541,546 ----
      if ($revision->get('markup'))
          $params['markup'] = $revision->get('markup');
! 
!     $params['charset'] = CHARSET;
  
      // Non-US-ASCII is not allowed in Mime headers (at least not without