nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-08-03 08:01:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1700 from laf/db-fix

Browse Source
This commit is contained in:
Søren Rosiak
2015-08-15 19:44:19 +02:00
parent 3745ffdc1c 446add9dd6
commit 10cca8d208
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-base.php
+7 -7
View File
@@ -14,24 +14,24 @@ if ($sql_fh === false) {
exit(1); exit(1);
} }
$connection = mysqli_connect($config['db_host'], $config['db_user'], $config['db_pass']); $database_link = mysqli_connect($config['db_host'], $config['db_user'], $config['db_pass']);
if ($connection === false) { if ($database_link === false) {
echo 'ERROR: Cannot connect to database: '.mysqli_error($connection)."\n"; echo 'ERROR: Cannot connect to database: '.mysqli_error($database_link)."\n";
exit(1); exit(1);
} }
$select = mysqli_select_db($connection, $config['db_name']); $select = mysqli_select_db($database_link, $config['db_name']);
if ($select === false) { if ($select === false) {
echo 'ERROR: Cannot select database: '.mysqli_error($connection)."\n"; echo 'ERROR: Cannot select database: '.mysqli_error($database_link)."\n";
exit(1); exit(1);
} }
while (!feof($sql_fh)) { while (!feof($sql_fh)) {
$line = fgetss($sql_fh); $line = fgetss($sql_fh);
if (!empty($line)) { if (!empty($line)) {
$creation = mysqli_query($connection, $line); $creation = mysqli_query($database_link, $line);
if (!$creation) { if (!$creation) {
echo 'WARNING: Cannot execute query ('.$line.'): '.mysqli_error($connection)."\n"; echo 'WARNING: Cannot execute query ('.$line.'): '.mysqli_error($database_link)."\n";
} }
} }
} }
html/install.php
+1
View File
@@ -307,6 +307,7 @@ elseif($stage == "2") {
$config['db_user']=$dbuser; $config['db_user']=$dbuser;
$config['db_pass']=$dbpass; $config['db_pass']=$dbpass;
$config['db_name']=$dbname; $config['db_name']=$dbname;
$config['db']['extension']='mysqli';
$sql_file = '../build.sql'; $sql_file = '../build.sql';
require '../build-base.php'; require '../build-base.php';
?> ?>