修复多个模板重复加载相同hook导致的问题
This commit is contained in:
parent
7e3f2be082
commit
99f87cc9e6
|
|
@ -159,7 +159,6 @@ class SettingRepo
|
||||||
self::clearCache();
|
self::clearCache();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clear all cache.
|
* Clear all cache.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,11 @@ class PluginServiceProvider extends ServiceProvider
|
||||||
}
|
}
|
||||||
|
|
||||||
$enabledPlugins = $manager->getEnabledPlugins();
|
$enabledPlugins = $manager->getEnabledPlugins();
|
||||||
|
$currentTheme = system_setting('base.theme');
|
||||||
foreach ($enabledPlugins as $plugin) {
|
foreach ($enabledPlugins as $plugin) {
|
||||||
|
if($plugin->type == 'theme' && $plugin->code != $currentTheme) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
$pluginCode = $plugin->getDirname();
|
$pluginCode = $plugin->getDirname();
|
||||||
$this->bootPlugin($plugin);
|
$this->bootPlugin($plugin);
|
||||||
$this->registerRoutes($pluginCode);
|
$this->registerRoutes($pluginCode);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue