Merge branch 'MDL-77783-400' of https://github.com/junpataleta/moodle …

…into MOODLE_400_STABLE
moodle · Mar 31, 2023 · dc2b74c · dc2b74c
2 parents db31cd3 + 13fec41
commit dc2b74c
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/lib/classes/component.php b/lib/classes/component.php
@@ -553,7 +553,18 @@ protected static function fetch_subtypes($ownerdir) {
         $types = array();
         $subplugins = array();
         if (file_exists("$ownerdir/db/subplugins.json")) {
-            $subplugins = (array) json_decode(file_get_contents("$ownerdir/db/subplugins.json"))->plugintypes;
+            $subplugins = [];
+            $subpluginsjson = json_decode(file_get_contents("$ownerdir/db/subplugins.json"));
+            if (json_last_error() === JSON_ERROR_NONE) {
+                if (!empty($subpluginsjson->plugintypes)) {
+                    $subplugins = (array) $subpluginsjson->plugintypes;
+                } else {
+                    error_log("No plugintypes defined in $ownerdir/db/subplugins.json");
+                }
+            } else {
+                $jsonerror = json_last_error_msg();
+                error_log("$ownerdir/db/subplugins.json is invalid ($jsonerror)");
+            }
         } else if (file_exists("$ownerdir/db/subplugins.php")) {
             error_log('Use of subplugins.php has been deprecated. ' .
                 "Please update your '$ownerdir' plugin to provide a subplugins.json file instead.");