Merge branch 'wip-94853-m402' into MOODLE_402_STABLE

microsoft · Oct 4, 2023 · 9928f88 · 9928f88
2 parents 0f528cf + 720e163
commit 9928f88
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/db/upgrade.php b/db/upgrade.php
@@ -723,6 +723,10 @@ function xmldb_local_o365_upgrade($oldversion) {
         if ($systemtokensconfig !== false) {
             $systemtokensconfig = unserialize($systemtokensconfig);
             foreach ($systemtokensconfig as $resource => $tokenconfig) {
+                // Make sure this is an array.
+                if (!is_array($tokenconfig)) {
+                    continue;
+                }
                 if (array_key_exists('resource', $tokenconfig)) {
                     $systemtokensconfig[$resource]['tokenresource'] = $tokenconfig['resource'];
                     unset($systemtokensconfig[$resource]['resource']);