Fixed a bug during installation

It set the "option" on the dbconfig and saved it to the config file as a string. Then it failed to load the file.
2.0
Wruczek 6 years ago
parent 428e383c91
commit 972c2e6520

@ -43,14 +43,15 @@ if (!empty($_POST)) {
// try to connect only if dbconfig is defined // try to connect only if dbconfig is defined
if (isset($dbconfig)) { if (isset($dbconfig)) {
try { try {
// Enable DB exceptions instead of silent fails $errmodeException = [
$dbconfig += [
"option" => [ "option" => [
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
] ]
]; ];
$db = new Medoo($dbconfig); // Enable DB exceptions instead of silent fails, only for the Medoo
// object and not for the dbConfig, we dont want to get it saved
$db = new Medoo($dbconfig + $errmodeException);
$sqlfiles = []; $sqlfiles = [];

@ -32,10 +32,8 @@ class DatabaseUtils {
$config = $this->configUtils->getDatabaseConfig(); $config = $this->configUtils->getDatabaseConfig();
// Enable DB exceptions instead of silent fails // Enable DB exceptions instead of silent fails
$config += [ $config["config"] = [
"option" => [ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
]
]; ];
$db = new Medoo($config); $db = new Medoo($config);

Loading…
Cancel
Save