diff options
| author | Mario <mario@mariovavti.com> | 2022-03-01 20:20:58 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2022-03-01 20:20:58 +0000 |
| commit | 0e2e9321025f87fe9587f3d183adaea6185e4e20 (patch) | |
| tree | 4ca14219353b251bd89d31608a56809dd97b7e92 | |
| parent | 53c842c614ea60650f39f53cecaf8aef65f3ccb6 (diff) | |
| parent | d384f55dd1d10bebfa9cf1ba41994b3b6cba4afe (diff) | |
| download | volse-hubzilla-0e2e9321025f87fe9587f3d183adaea6185e4e20.tar.gz volse-hubzilla-0e2e9321025f87fe9587f3d183adaea6185e4e20.tar.bz2 volse-hubzilla-0e2e9321025f87fe9587f3d183adaea6185e4e20.zip | |
Merge branch 't0rum-master-patch-68993' into 'master'
Typo in Setup.php prevents users from using Postgres
See merge request hubzilla/core!2014
| -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()) { |