From 0f2a6791d0ae752a0252d7a749d496a42c8bc269 Mon Sep 17 00:00:00 2001
From: onli <onli@paskuda.biz>
Date: Sat, 6 Mar 2021 18:37:25 +0100
Subject: [PATCH] Set utf8 as default for databases (and utf8mb4 when possible)

---
 include/functions_installer.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php
index bfe9974f..bf6fc7fa 100644
--- a/include/functions_installer.inc.php
+++ b/include/functions_installer.inc.php
@@ -109,10 +109,10 @@ function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $db
     fwrite($configfp, "\t\$serendipity['dbType']            = '" . addslashes($dbType) . "';\n");
     fwrite($configfp, "\t\$serendipity['dbPersistent']      = ". (serendipity_db_bool($dbPersistent) ? 'true' : 'false') .";\n");
     if ($serendipity['dbNames']) {
-        if (($dbType == 'mysqli' || $dbType == 'mysql') && SQL_CHARSET == 'utf8' && serendipity_utf8mb4_ready()) {
+        if (($dbType == 'mysqli' || $dbType == 'mysql') && serendipity_utf8mb4_ready()) {
             fwrite($configfp, "\t\$serendipity['dbCharset']         = 'utf8mb4';\n");
         } else {
-            fwrite($configfp, "\t\$serendipity['dbCharset']         = '" . addslashes(SQL_CHARSET) . "';\n");
+            fwrite($configfp, "\t\$serendipity['dbCharset']         = 'utf8';\n");
         }
     }