Merge remote-tracking branch 'origin/stable'

This commit is contained in:
Dylan K. Taylor
2019-07-19 13:45:53 +01:00
2 changed files with 4 additions and 4 deletions

View File

@ -290,7 +290,7 @@ class PluginManager{
}
$plugins[$name] = $file;
$softDependencies[$name] = $description->getSoftDepend();
$softDependencies[$name] = array_merge($softDependencies[$name] ?? [], $description->getSoftDepend());
$dependencies[$name] = $description->getDepend();
foreach($description->getLoadBefore() as $before){