From c02319385c947439792e233087f37fd975fcd084 Mon Sep 17 00:00:00 2001
From: sgm0422 <976204163@qq.com>
Date: Fri, 5 Jun 2020 15:48:57 +0800
Subject: [PATCH] * Fix install and upgrade logic.

---
 module/install/model.php | 1 +
 module/upgrade/model.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/module/install/model.php b/module/install/model.php
index 72c17bcb26..4863dc554b 100644
--- a/module/install/model.php
+++ b/module/install/model.php
@@ -462,6 +462,7 @@ class installModel extends model
             }
 
             $table = str_replace('__DELIMITER__', ';', $table);
+            $table = str_replace('__TABLE__', $this->config->db->name, $table);
 
             /* Skip sql that is note. */
             if(strpos($table, '--') === 0) continue;
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index ed98842fdf..cde4cf00d2 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -1378,6 +1378,7 @@ class upgradeModel extends model
 
             $sql = str_replace('zt_', $this->config->db->prefix, $sql);
             $sql = str_replace('__DELIMITER__', ';', $sql);
+            $sql = str_replace('__TABLE__', $this->config->db->name, $sql);
             try
             {
                 $this->saveLogs($sql);