diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php
index 89530073..b27f9149 100644
--- a/application/admin/controller/Addon.php
+++ b/application/admin/controller/Addon.php
@@ -161,8 +161,13 @@ class Addon extends Backend
try {
Service::uninstall($name, $force);
if ($tables) {
+ $prefix = Config::get('database.prefix');
//删除插件关联表
foreach ($tables as $index => $table) {
+ //忽略非插件标识的表名
+ if (!preg_match("/^{$prefix}{$name}/", $table)) {
+ continue;
+ }
Db::execute("DROP TABLE IF EXISTS `{$table}`");
}
}
@@ -389,6 +394,14 @@ class Addon extends Backend
{
$name = $this->request->post("name");
$tables = get_addon_tables($name);
+ $prefix = Config::get('database.prefix');
+ foreach ($tables as $index => $table) {
+ //忽略非插件标识的表名
+ if (!preg_match("/^{$prefix}{$name}/", $table)) {
+ unset($tables[$index]);
+ }
+ }
+ $tables = array_values($tables);
$this->success('', null, ['tables' => $tables]);
}
}
diff --git a/application/admin/view/layout/default.html b/application/admin/view/layout/default.html
index 31d1ec68..b569e7b4 100644
--- a/application/admin/view/layout/default.html
+++ b/application/admin/view/layout/default.html
@@ -16,7 +16,7 @@
{:__('Control panel')}
- {if !IS_DIALOG && !$Think.config.fastadmin.multiplenav}
+ {if !IS_DIALOG && !$Think.config.fastadmin.multiplenav && $Think.config.fastadmin.breadcrumb}
{include file="common/script" /}
-