diff options
| author | Mario <mario@mariovavti.com> | 2022-03-01 20:20:58 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-03-01 21:21:50 +0100 |
| commit | c3c40548b9327849154597eea724bd9067106f57 (patch) | |
| tree | 35a515e5501b8f12a0e961b804d79298e60b68ae /Zotlabs/Module | |
| parent | 6930c4e23b8b24f7436c0e265d751460bed9b1d2 (diff) | |
| download | volse-hubzilla-c3c40548b9327849154597eea724bd9067106f57.tar.gz volse-hubzilla-c3c40548b9327849154597eea724bd9067106f57.tar.bz2 volse-hubzilla-c3c40548b9327849154597eea724bd9067106f57.zip | |
Merge branch 't0rum-master-patch-68993' into 'master'
Typo in Setup.php prevents users from using Postgres
See merge request hubzilla/core!2014
(cherry picked from commit 0e2e9321025f87fe9587f3d183adaea6185e4e20)
d384f55d Typo in Setup.php prevents users from using Postgres
Diffstat (limited to 'Zotlabs/Module')
| -rw-r--r-- | Zotlabs/Module/Setup.php | 4 |
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()) { |