TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #684 - Plugins still load language, routes, etc when noInit is enabled

This commit is contained in:
Sam Georges 2014-10-16 19:48:21 +11:00
parent 1203043a45
commit 8d618d4e29
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/system/classes/PluginManager.php
View File

@ -116,14 +116,16 @@ class PluginManager
*/
public function registerAll()
{
if ($this->registered || self::$noInit)
if ($this->registered)
return;
foreach ($this->plugins as $pluginId => $plugin) {
if ($plugin->disabled)
continue;
$plugin->register();
if (!self::$noInit)
$plugin->register();
$pluginPath = $this->getPluginPath($plugin);
$pluginNamespace = strtolower($pluginId);
@ -171,14 +173,15 @@ class PluginManager
*/
public function bootAll()
{
if ($this->booted || self::$noInit)
if ($this->booted)
return;
foreach ($this->plugins as $plugin) {
if ($plugin->disabled)
continue;
$plugin->boot();
if (!self::$noInit)
$plugin->boot();
}
$this->booted = true;