Merge pull request #1320 from Miguel-Reis/patch-1

This commit is contained in:
Jan 2022-06-21 09:16:00 +02:00 committed by GitHub
commit e092c0ab1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -60,6 +60,7 @@ $dbConnect['host'] = $host;
$dbConnect['user'] = $user;
$dbConnect['pwd'] = $pwd;
$dbConnect['db'] = $db;
$dbConnect['charset'] = "utf8";
if (isset($demo) and $demo == 1) {
$ui->demoMode();
@ -75,8 +76,8 @@ if (isset($debug) and $debug == 1) {
$dbConnect['debug'] = 0;
}
try {
$dbConnect['connect']="${dbConnect['type']}:host=${dbConnect['host']};dbname=${dbConnect['db']}";
$sql = ($dbConnect['type'] == 'mysql') ? new PDO($dbConnect['connect'], $dbConnect['user'], $dbConnect['pwd'], array(PDO::MYSQL_ATTR_INIT_COMMAND=>"SET NAMES utf8")) : new PDO($dbConnect['connect'], $dbConnect['user'], $dbConnect['pwd']);
$dbConnect['connect']="${dbConnect['type']}:host=${dbConnect['host']};dbname=${dbConnect['db']};charset=${dbConnect['charset']}";
$sql = new \PDO($dbConnect['connect'], $dbConnect['user'], $dbConnect['pwd']);
if ($dbConnect['debug'] == 1) {
$sql->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@ -479,4 +480,4 @@ if (!isset($reseller_id)) {
if (!isset($resellerLockupID)) {
$resellerLockupID = $reseller_id;
}
}