From c3c40548b9327849154597eea724bd9067106f57 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Tue, 1 Mar 2022 20:20:58 +0000
Subject: 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
---
 Zotlabs/Module/Setup.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Zotlabs/Module')

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()) {
-- 
cgit v1.2.3