php-blog-cvs

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6963

Modified Files:
	serendipity_admin_installer.inc.php 
	serendipity_functions_installer.inc.php 
Log Message:
This is more correct, IIRC


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- serendipity_admin_installer.inc.php	16 Jun 2004 18:28:58 -0000	1.67
+++ serendipity_admin_installer.inc.php	16 Jun 2004 18:56:44 -0000	1.68
@@ -112,13 +112,7 @@
             if (version_compare(PHP_VERSION, VERSION_REQUIRED) == -1) {
                 echo '<br /><font color="#FF0000">WARNING!<br />You are using PHP version '. PHP_VERSION .'! Serendipity requires version '. VERSION_REQUIRED .'</font>';
             }
-            $from = array();
-            if ( extension_loaded('mysqli') )
-              $from['dbType'] = 'mysqli';
-            if ( extension_loaded('postgres') )
-              $from['dbType'] = 'postgres';
-            if ( extension_loaded('mysql') )
-              $from['dbType'] = 'mysql';
+            $from = false;
         }
 
         $t = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_functions_installer.inc.php	13 Jun 2004 21:28:20 -0000	1.12
+++ serendipity_functions_installer.inc.php	16 Jun 2004 18:56:44 -0000	1.13
@@ -47,6 +47,19 @@
     }
 
     switch ($optname) {
+
+        case 'dbType' : 
+            if ( extension_loaded('mysqli') ) {
+                $type = 'mysqli';
+            }
+            if ( extension_loaded('postgres') ) {
+                $type = 'postgres';
+            }
+            if ( extension_loaded('mysql') ) {
+                $type = 'mysql';
+            }
+            return $type;
+
         case 'serendipityPath':
             $test_path1 = $_SERVER['DOCUMENT_ROOT'] . rtrim(dirname($_SERVER['PHP_SELF']), '/') . '/';
             $test_path2 = dirname(__FILE__);