Don't let dependant plugins automatically enable plugins which should be disabled by default
Follow-up to f10440b and c0a7fdc
This commit is contained in:
parent
c0a7fdc801
commit
a2aa46fd0e
@ -78,8 +78,13 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
|
|||||||
if (is_array($pluginConfig) && isset($pluginConfig['enabled'])) {
|
if (is_array($pluginConfig) && isset($pluginConfig['enabled'])) {
|
||||||
$this->setEnabled($pluginConfig['enabled']);
|
$this->setEnabled($pluginConfig['enabled']);
|
||||||
} elseif ($this->enabled) {
|
} elseif ($this->enabled) {
|
||||||
// make sure dependencies are fulfilled
|
// make sure dependencies are already fulfilled,
|
||||||
$this->checkDependencies(true);
|
// otherwise the plugin needs to be enabled manually
|
||||||
|
try {
|
||||||
|
$this->checkDependencies(false);
|
||||||
|
} catch (RuntimeException $e) {
|
||||||
|
$this->enabled = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user