diff --git a/build-base.php b/build-base.php index d00a62e0c1..4e0609ff07 100644 --- a/build-base.php +++ b/build-base.php @@ -14,24 +14,24 @@ if ($sql_fh === false) { exit(1); } -$connection = mysqli_connect($config['db_host'], $config['db_user'], $config['db_pass']); -if ($connection === false) { - echo 'ERROR: Cannot connect to database: '.mysqli_error($connection)."\n"; +$database_link = mysqli_connect($config['db_host'], $config['db_user'], $config['db_pass']); +if ($database_link === false) { + echo 'ERROR: Cannot connect to database: '.mysqli_error($database_link)."\n"; exit(1); } -$select = mysqli_select_db($connection, $config['db_name']); +$select = mysqli_select_db($database_link, $config['db_name']); if ($select === false) { - echo 'ERROR: Cannot select database: '.mysqli_error($connection)."\n"; + echo 'ERROR: Cannot select database: '.mysqli_error($database_link)."\n"; exit(1); } while (!feof($sql_fh)) { $line = fgetss($sql_fh); if (!empty($line)) { - $creation = mysqli_query($connection, $line); + $creation = mysqli_query($database_link, $line); if (!$creation) { - echo 'WARNING: Cannot execute query ('.$line.'): '.mysqli_error($connection)."\n"; + echo 'WARNING: Cannot execute query ('.$line.'): '.mysqli_error($database_link)."\n"; } } } diff --git a/html/install.php b/html/install.php index 6aac6bc5d4..123fac346d 100644 --- a/html/install.php +++ b/html/install.php @@ -307,6 +307,7 @@ elseif($stage == "2") { $config['db_user']=$dbuser; $config['db_pass']=$dbpass; $config['db_name']=$dbname; + $config['db']['extension']='mysqli'; $sql_file = '../build.sql'; require '../build-base.php'; ?>