maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

let's see if that works :P

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-03 17:29:42 +01:00
parent 0b3d532028
commit ec4d34d37a
3 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/classes/database/class.Database.php
View File

@@ -267,13 +267,8 @@ class Database {
// build up connection string
$driver = 'mysql';
$dsn = $driver.":";
$version_server = PDO::getAttribute(PDO::ATTR_SERVER_VERSION);
$sql_mode = 'NO_ENGINE_SUBSTITUTION';
if (version_compare($version_server, '8.0.11', '<')) {
$sql_mode .= ',NO_AUTO_CREATE_USER';
}
$options = array(
'PDO::MYSQL_ATTR_INIT_COMMAND' => 'SET names utf8,sql_mode="' . $sql_mode . '"'
'PDO::MYSQL_ATTR_INIT_COMMAND' => 'SET names utf8'
);
$attributes = array('ATTR_ERRMODE' => 'ERRMODE_EXCEPTION');
@@ -311,6 +306,13 @@ class Database {
self::$_link->setAttribute(constant("PDO::".$k), constant("PDO::".$v));
}
$version_server = self::$_link->getAttribute(PDO::ATTR_SERVER_VERSION);
$sql_mode = 'NO_ENGINE_SUBSTITUTION';
if (version_compare($version_server, '8.0.11', '<')) {
$sql_mode .= ',NO_AUTO_CREATE_USER';
}
self::$_link->exec('SET sql_mode = "'.$sql_mode.'"');
// return PDO instance
return self::$_link;
}