diff options
| author | Mario <mario@mariovavti.com> | 2022-02-10 19:45:08 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-02-10 19:45:08 +0000 |
| commit | 521c9eb5660df0a954f68499b905f8dc1958bbb3 (patch) | |
| tree | e075212a0fcb3037b3b8b9a3fb409ea8172d40f4 /boot.php | |
| parent | 8e79a81b8879b38c06ce3f7a211b87e838773f60 (diff) | |
| parent | 35877b13825b2c3db44ff89977344b84f8e21d9a (diff) | |
| download | volse-hubzilla-521c9eb5660df0a954f68499b905f8dc1958bbb3.tar.gz volse-hubzilla-521c9eb5660df0a954f68499b905f8dc1958bbb3.tar.bz2 volse-hubzilla-521c9eb5660df0a954f68499b905f8dc1958bbb3.zip | |
Merge branch 'dev'
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -664,12 +664,17 @@ function sys_boot() { require_once('include/dba/dba_driver.php'); if (!App::$install) { - DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type, App::$install); + + if (empty($db_charset)) { + $db_charset = ((intval($db_type) === 0) ? 'utf8mb4' : 'UTF8'); + } + + DBA::dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type, $db_charset, App::$install); if (!DBA::$dba->connected) { system_unavailable(); } - unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type); + unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type, $db_charset); /* * Load configs from db. Overwrite configs from .htconfig.php |