Merge branch 'fix-plugins' into 'development'

Fixed problems with Plugins class. Adding plugins now no longer get overridden.

See merge request fuzeworks/core!67
This commit is contained in:
Abel Hoogeveen 2018-11-21 23:43:11 +00:00
commit 78c92471e2
1 changed files with 1 additions and 2 deletions

View File

@ -110,7 +110,6 @@ class Plugins
public function loadHeadersFromPluginPaths()
{
// Cycle through all pluginPaths
$this->headers = array();
foreach ($this->pluginPaths as $pluginPath) {
// If directory does not exist, skip it
@ -165,7 +164,7 @@ class Plugins
protected function loadHeader(iPluginHeader $header): bool
{
// Fetch the name
$pluginName = $header->getName();
$pluginName = ucfirst($header->getName());
// Check if the plugin is disabled
if (in_array($pluginName, $this->cfg->disabled_plugins))