From 9ffac6825ea00de455298c59c0ea953d186cf080 Mon Sep 17 00:00:00 2001
From: liugang <liugang@chandao.com>
Date: Tue, 4 Nov 2025 15:27:33 +0800
Subject: [PATCH] + [misc] Save database collation to config/my.php.

---
 module/install/control.php       | 1 +
 module/install/ui/step3.html.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/module/install/control.php b/module/install/control.php
index 937afe18bb..176ce18232 100644
--- a/module/install/control.php
+++ b/module/install/control.php
@@ -148,6 +148,7 @@ class install extends control
 
             $myConfig = array();
             foreach($data as $key => $value) $myConfig[$key] = $value;
+            $myConfig['dbCollation'] = $this->install->dbh->getDatabaseCollation();
             $this->session->set('myConfig', $myConfig);
             return $this->send(array('result' => 'success', 'load' => inlink('showTableProgress')));
         }
diff --git a/module/install/ui/step3.html.php b/module/install/ui/step3.html.php
index 7378b23c33..88ed6a3c8c 100644
--- a/module/install/ui/step3.html.php
+++ b/module/install/ui/step3.html.php
@@ -31,6 +31,7 @@ $configContent = <<<EOT
 \$config->db->name        = '{$myConfig['dbName']}';
 \$config->db->user        = '{$myConfig['dbUser']}';
 \$config->db->encoding    = '{$myConfig['dbEncoding']}';
+\$config->db->collation   = '{$myConfig['dbCollation']}';
 \$config->db->password    = '{$myConfig['dbPassword']}';
 \$config->db->prefix      = '{$myConfig['dbPrefix']}';
 \$config->webRoot         = getWebRoot();