Exception handling when disabled.json returns null

Fixes #2341
2016-09-03 12:19:22 +10:00 · 2016-09-03 12:19:22 +10:00 · 58c669bf1e
parent 6c474bcae9
commit 58c669bf1e
1 changed files with 1 additions and 1 deletions
--- a/modules/system/classes/PluginManager.php
+++ b/modules/system/classes/PluginManager.php
@ -442,7 +442,7 @@ class PluginManager
        }

        if (File::exists($path)) {
-            $disabled = json_decode(File::get($path), true);
+            $disabled = json_decode(File::get($path), true) ?: [];
            $this->disabledPlugins = array_merge($this->disabledPlugins, $disabled);
        }
        else {