Fixed hangouts on php installations with zlib extension installed, fixed warnings...

[fa-stable.git] / admin / db / maintenance_db.inc

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 5ce47443dd6e23ca7f1401eb042734be013c461b..cd4afdacf477f1178da6fd18352834eddaa0abba 100644 (file)
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -178,7 +178,7 @@ function update_extensions($extensions) {
        }
 
        // update per company files
-       $cnt = count($db_connections);
+       $cnt = max(1, count($db_connections));
        for($i = 0; $i < $cnt; $i++) 
        {
                $newexts = $extensions;
@@ -253,7 +253,9 @@ function write_lang()
 
 function db_import($filename, $connection, $force=true)
 {
-       global $db, $go_debug;
+       global $db, $go_debug, $sql_trail;
+
+       $sql_trail = false;
 
        $allowed_commands = array(
                "create"  => 'table_queries', 
@@ -301,8 +303,7 @@ function db_import($filename, $connection, $force=true)
                {       // check if line begins with one of allowed queries
                        foreach($allowed_commands as $cmd => $table) 
                        {
-//                             if (strtolower(substr($line, 0, strlen($cmd))) == $cmd) 
-                               if (stripos($line, $cmd) === 0) 
+                               if (strtolower(substr($line, 0, strlen($cmd))) == $cmd) 
                                {
                                        if ($cmd == 'delimiter') {
                                                $delimiter = trim(substr($line, 10));
@@ -327,7 +328,7 @@ function db_import($filename, $connection, $force=true)
                }
                
        }
-       
+/*
        {       // for debugging purposes
        global $path_to_root;
        $f = fopen($path_to_root.'/tmp/dbimport.txt', 'w+');
@@ -336,7 +337,7 @@ function db_import($filename, $connection, $force=true)
        fwrite($f, print_r($data_queries,true));
        fclose($f);
        }
-
+*/
        // execute drop tables if exists queries
        if (is_array($drop_queries))
        {