From dad4ca6331aaca540142cf4880eb9b188ff4274a Mon Sep 17 00:00:00 2001
From: garvinhicking <garvinhicking>
Date: Fri, 9 Jun 2006 11:11:27 +0000
Subject: [PATCH] only issue the charset if "dbNames" is activated/enabled in
 config

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

diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php
index 9eb6101..70d56d9 100644
--- a/include/functions_installer.inc.php
+++ b/include/functions_installer.inc.php
@@ -107,7 +107,9 @@ function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $db
     fwrite($configfp, "\t\$serendipity['dbPass']            = '" . addslashes($dbPass) . "';\n");
     fwrite($configfp, "\t\$serendipity['dbType']            = '" . addslashes($dbType) . "';\n");
     fwrite($configfp, "\t\$serendipity['dbPersistent']      = ". (serendipity_db_bool($dbPersistent) ? 'true' : 'false') .";\n");
-    fwrite($configfp, "\t\$serendipity['dbCharset']         = '" . addslashes(SQL_CHARSET) . "';\n");
+    if ($serendipity['dbNames']) {
+        fwrite($configfp, "\t\$serendipity['dbCharset']         = '" . addslashes(SQL_CHARSET) . "';\n");
+    }
 
     if (is_array($privateVariables) && count($privateVariables) > 0) {
         foreach($privateVariables AS $p_idx => $p_val) {
-- 
2.39.5