From 58c669bf1efe469243b0e7c5ba020d9f5abd3e74 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 3 Sep 2016 12:19:22 +1000
Subject: [PATCH] Exception handling when disabled.json returns null Fixes
 #2341

---
 modules/system/classes/PluginManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/system/classes/PluginManager.php b/modules/system/classes/PluginManager.php
index ac7367404..adb16b51e 100644
--- 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 {