heibai2006/webman_admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
walkor 2022-12-26 15:53:10 +08:00
parent b5ca8b20b1
commit 8dc51585e8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugin/admin/app/controller/InstallController.php
View File

@ -78,17 +78,17 @@ class InstallController extends Base
'wa_uploads', 'wa_uploads',
]; ];
$tables_exist = [];
foreach ($tables as $table) {
$tables_exist[] = current($table);
}
$tables_conflict = array_intersect($tables_to_install, $tables_exist);
if (!$overwrite) { if (!$overwrite) {
$tables_exist = [];
foreach ($tables as $table) {
$tables_exist[] = current($table);
}
$tables_conflict = array_intersect($tables_to_install, $tables_exist);
if ($tables_conflict) { if ($tables_conflict) {
return $this->json(1, '以下表' . implode(',', $tables_conflict) . '已经存在，如需覆盖请选择强制覆盖'); return $this->json(1, '以下表' . implode(',', $tables_conflict) . '已经存在，如需覆盖请选择强制覆盖');
} }
} else { } else {
foreach ($tables_to_install as $table) { foreach ($tables_conflict as $table) {
$db->exec("DROP TABLE `$table`"); $db->exec("DROP TABLE `$table`");
} }
} }