M_Viper/ts-website
M_Viper
/
ts-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Wruczek 2019-02-01 03:05:56 +01:00
parent 428e383c91
commit 972c2e6520
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/installer/pages/3.php
View File

@ -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 = [];

6
src/private/php/Utils/DatabaseUtils.php
View File

@ -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);