aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-03-02 19:53:16 +0000
committerMario <mario@mariovavti.com>2022-03-02 19:53:16 +0000
commitcf3c0b593b891f71b96a378f45f16931acd93a37 (patch)
tree837b2c47d342f9262ed938d11834df7df0bb36c2
parent34f64148e8c936ac1189be937329ebe708e942b6 (diff)
parentc3c40548b9327849154597eea724bd9067106f57 (diff)
downloadvolse-hubzilla-cf3c0b593b891f71b96a378f45f16931acd93a37.tar.gz
volse-hubzilla-cf3c0b593b891f71b96a378f45f16931acd93a37.tar.bz2
volse-hubzilla-cf3c0b593b891f71b96a378f45f16931acd93a37.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
-rw-r--r--Zotlabs/Module/Setup.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index 04b31e27b..f068cbef8 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -75,7 +75,7 @@ class Setup extends \Zotlabs\Web\Controller {
$siteurl = ((isset($_POST['siteurl'])) ? trim($_POST['siteurl']) : '');
if (empty($db_charset)) {
- $db_charset = ((intval($db_type) === 0) ? 'utf8mb4' : 'UTF8');
+ $db_charset = ((intval($dbtype) === 0) ? 'utf8mb4' : 'UTF8');
}
// $siteurl should not have a trailing slash
@@ -106,7 +106,7 @@ class Setup extends \Zotlabs\Web\Controller {
$siteurl = ((isset($_POST['siteurl'])) ? trim($_POST['siteurl']) : '');
if (empty($db_charset)) {
- $db_charset = ((intval($db_type) === 0) ? 'utf8mb4' : 'UTF8');
+ $db_charset = ((intval($dbtype) === 0) ? 'utf8mb4' : 'UTF8');
}
if($siteurl != z_root()) {