[php-blog-cvs] serendipity/include functions_installer.inc.php,1.5,1.6

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
- Allow the usage of persistant database connections


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- functions_installer.inc.php	27 Nov 2004 22:14:14 -0000	1.5
+++ functions_installer.inc.php	29 Nov 2004 23:21:44 -0000	1.6
@@ -1,10 +1,10 @@
 <?php # $Id$
-function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $dbPass, $dbType, $file = 'serendipity_config_local.inc.php', $path = null, $privateVariables = null) {
+function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $dbPass, $dbType, $dbPersistant, $privateVariables = null) {
     global $serendipity;
     umask(0000);
-    if (is_null($path)) {
-        $path = $serendipity['serendipityPath'];
-    }
+
+    $file = 'serendipity_config_local.inc.php';
+    $path = $serendipity['serendipityPath'];
 
     $oldconfig = @file_get_contents($path . $file);
     $configfp  = fopen($path . $file, 'w');
@@ -47,6 +47,7 @@
     fwrite($configfp, "\t\$serendipity['dbUser']            = '{$dbUser}';\n");
     fwrite($configfp, "\t\$serendipity['dbPass']            = '{$dbPass}';\n");
     fwrite($configfp, "\t\$serendipity['dbType']            = '{$dbType}';\n");
+    fwrite($configfp, "\t\$serendipity['dbPersistant']      = ". (serendipity_db_bool($dbPersistant) ? 'true' : 'false') .";\n");
 
     if (is_array($privateVariables) && count($privateVariables) > 0) {
         foreach($privateVariables AS $p_idx => $p_val) {
@@ -735,8 +736,7 @@
                                              $_POST['dbUser'],
                                              $_POST['dbPass'],
                                              $_POST['dbType'],
-                                             'serendipity_config_local.inc.php',
-                                             $_POST['serendipityPath']);
+                                             $_POST['dbPersistant']);
     } else {
         return true;
     }