[phpwiki-checkins] CVS: phpwiki/lib WikiDB.php,1.74,1.75 upgrade.php,1.23,1.24

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22175

Modified Files:
	WikiDB.php upgrade.php 
Log Message:
sqlite autoincrement fix

Index: WikiDB.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiDB.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -2 -b -p -d -r1.74 -r1.75
--- WikiDB.php	3 Jul 2004 16:51:05 -0000	1.74
+++ WikiDB.php	5 Jul 2004 13:56:22 -0000	1.75
@@ -813,7 +813,7 @@ class WikiDB_Page 
         // We're doing this here rather than in createRevision because
         // postgres can't optimize while locked.
-        if (time() % 50 == 0) {
+        if (DEBUG or (time() % 50 == 0)) {
             if ($backend->optimize())
-                trigger_error(sprintf(_("Optimizing %s"),'backend'), E_USER_NOTICE);
+                trigger_error(_("Optimizing database"), E_USER_NOTICE);
         }
 
@@ -1892,4 +1892,7 @@ class WikiDB_cache 
 
 // $Log$
+// Revision 1.75  2004/07/05 13:56:22  rurban
+// sqlite autoincrement fix
+//
 // Revision 1.74  2004/07/03 16:51:05  rurban
 // optional DBADMIN_USER:DBADMIN_PASSWD for action=upgrade (if no ALTER permission)

Index: upgrade.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/upgrade.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -2 -b -p -d -r1.23 -r1.24
--- upgrade.php	4 Jul 2004 10:28:06 -0000	1.23
+++ upgrade.php	5 Jul 2004 13:56:22 -0000	1.24
@@ -45,4 +45,6 @@ rcs_id('$Id$');
  *  6. Convert the automatic update to a class-based multi-page 
  *     version. (hard)
+
+ * TODO: overwrite=1 link on edit conflicts at end of page to overwrite all.
  *
  * @author: Reini Urban
@@ -53,5 +55,5 @@ require_once("lib/loadsave.php");
 
 /**
- * TODO: check for the pgsrc_version number, not the revision
+ * TODO: check for the pgsrc_version number, not the revision mtime only
  */
 function doPgsrcUpdate(&$request,$pagename,$path,$filename) {
@@ -492,4 +494,7 @@ function DoUpgrade($request) {
 /**
  $Log$
+ Revision 1.24  2004/07/05 13:56:22  rurban
+ sqlite autoincrement fix
+
  Revision 1.23  2004/07/04 10:28:06  rurban
  DBADMIN_USER fix