0ct0pu5/webmum
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Database init parameter handling

Browse source
This commit is contained in:
ohartl 2016-05-16 19:45:13 +02:00
parent 5ba6def517
commit 171f2c7f11
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/php/classes/Database.php
View file

@ -95,15 +95,14 @@ class Database
{
if(!static::isInitialized()){
if(is_array($host)){
if(isset($host['host']) && isset($host['user']) && isset($host['password']) && isset($host['database'])){
$user = $host['user'];
$password = $host['password'];
$database = $host['database'];
$host = $host['host'];
}
else{
throw new InvalidArgumentException;
}
$database = isset($host['database']) ? $host['database'] : $database;
$password = isset($host['password']) ? $host['password'] : $password;
$user = isset($host['user']) ? $host['user'] : $user;
$host = isset($host['host']) ? $host['host'] : $host;
}
if(is_null($host) || is_null($user) || is_null($password) || is_null($database)){
throw new InvalidArgumentException('Missing parameters for database initialization.');
}
static::setInstance(