phpwiki-checkins

[Steve W. <wai...@us...>]

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

Modified Files:
	config.php 
Log Message:
Fixed a bug in the loading of dbmlib.php; if the $whichdatabase was
set to 'dbm' a logic error always set it to 'dba', which had
unpredictable results with PHP3.

Index: config.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/config.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** config.php	2001/01/21 11:00:00	1.22
--- config.php	2001/01/31 02:18:26	1.23
***************
*** 44,50 ****
  
     $WhichDatabase = 'default'; // use one of "dbm", "dba", "mysql",
!                                // "pgsql", "msql", or "file"
  
- 
     // DBM and DBA settings (default)
     if ($WhichDatabase == 'dbm' or $WhichDatabase == 'dba' or
--- 44,49 ----
  
     $WhichDatabase = 'default'; // use one of "dbm", "dba", "mysql",
!                            // "pgsql", "msql", or "file"
  
     // DBM and DBA settings (default)
     if ($WhichDatabase == 'dbm' or $WhichDatabase == 'dba' or
***************
*** 62,73 ****
  
        // for PHP3 use dbmlib, else use dbalib for PHP4
!       if (($WhichDatabase == 'default') and (floor(phpversion())) == 3) {
!          $WhichDatabase = 'dbm';
!       } else {
!          $WhichDatabase = 'dba';
        }
  
        if ($WhichDatabase == 'dbm') {
!           include "lib/dbmlib.php";
        } else {
            include "lib/dbalib.php";
--- 61,74 ----
  
        // for PHP3 use dbmlib, else use dbalib for PHP4
!       if ($WhichDatabase == 'default') {
!          if ( floor(phpversion()) == 3) {
!             $WhichDatabase = 'dbm';
!          } else {
!             $WhichDatabase = 'dba';
!          }
        }
  
        if ($WhichDatabase == 'dbm') {
!           include "lib/dbmlib.php"; 
        } else {
            include "lib/dbalib.php";