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

integrity check should allow utf8_* charachter sets and not only 'utf8', thx to lod

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2021-07-29 21:04:46 +02:00
parent bef580929e
commit 53401eebfb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Froxlor/Database/IntegrityCheck.php
View File

@@ -90,7 +90,7 @@ class IntegrityCheck
'dbname' => Database::getDbName() 'dbname' => Database::getDbName()
)); ));
$charset = isset($resp['default_character_set_name']) ? $resp['default_character_set_name'] : null; $charset = isset($resp['default_character_set_name']) ? $resp['default_character_set_name'] : null;
if (! empty($charset) && strtolower($charset) != 'utf8') { if (! empty($charset) && substr(strtolower($charset), 0, 4) != 'utf8') {
$this->log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "database charset seems to be different from UTF-8, integrity-check can fix that"); $this->log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "database charset seems to be different from UTF-8, integrity-check can fix that");
if ($fix) { if ($fix) {
// fix database // fix database