zhangyuheng/blessing-skin-server
1
0
Fork 0
forked from mirror/blessing-skin-server
Code Pull Requests Activity

Disable plugins which have conflicts

Browse Source
This commit is contained in:
Pig Fang 2019-08-21 17:31:51 +08:00
parent f7f0d9e3ec
commit 061c9d7f56
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/PluginManager.php
View File

@ -107,7 +107,7 @@ class PluginManager
$plugin = new Plugin($directory, $manifest);
$plugins->put($name, $plugin);
if ($this->getUnsatisfied($plugin)->isNotEmpty()) {
if ($this->getUnsatisfied($plugin)->isNotEmpty() || $this->getConflicts($plugin)->isNotEmpty()) {
$this->disable($plugin);
}
if ($this->enabled->has($name)) {