Merge branch 'MDL-76509-400' of https://github.com/safatshahin/moodle …

…into MOODLE_400_STABLE
moodle · Dec 13, 2022 · ff72ae1 · ff72ae1
2 parents 8a4a9fc + 26ed262
commit ff72ae1
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
@@ -4048,10 +4048,16 @@ function xmldb_main_upgrade($oldversion) {
         $runinsert = function (int $lastslot, array $tagstrings) use ($DB) {
             $conditiondata = $DB->get_field('question_set_references', 'filtercondition',
                 ['itemid' => $lastslot, 'component' => 'mod_quiz', 'questionarea' => 'slot']);
-            $condition = json_decode($conditiondata);
-            $condition->tags = $tagstrings;
-            $DB->set_field('question_set_references', 'filtercondition', json_encode($condition),
-                ['itemid' => $lastslot, 'component' => 'mod_quiz', 'questionarea' => 'slot']);
+
+            // It is possible to have leftover tags in the database, without a corresponding
+            // slot, because of an old bugs (e.g. MDL-76193). Therefore, if the slot is not found,
+            // we can safely discard these tags.
+            if (!empty($conditiondata)) {
+                $condition = json_decode($conditiondata);
+                $condition->tags = $tagstrings;
+                $DB->set_field('question_set_references', 'filtercondition', json_encode($condition),
+                        ['itemid' => $lastslot, 'component' => 'mod_quiz', 'questionarea' => 'slot']);
+            }
         };
 
         foreach ($slottags as $tag) {