From 9024289626a690096f323f1c87f175bccd7c1f43 Mon Sep 17 00:00:00 2001 From: Bence Molnar Date: Mon, 18 May 2020 21:04:36 +0100 Subject: [PATCH] MDL-68733 quiz editing: be more careful deleting random question tags --- mod/quiz/editrandom.php | 2 +- mod/quiz/locallib.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/quiz/editrandom.php b/mod/quiz/editrandom.php index 9e32148330b..c6c39943bf7 100644 --- a/mod/quiz/editrandom.php +++ b/mod/quiz/editrandom.php @@ -149,7 +149,7 @@ if ($mform->is_cancelled()) { // Now, delete the remaining records. if (!empty($recordstokeep)) { list($select, $params) = $DB->get_in_or_equal($recordstokeep, SQL_PARAMS_QM, 'param', false); - $DB->delete_records_select('quiz_slot_tags', "id $select", $params); + $DB->delete_records_select('quiz_slot_tags', "slotid = {$slot->id} AND id $select", $params); } else { $DB->delete_records('quiz_slot_tags', array('slotid' => $slot->id)); } diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php index 8bf670abab2..6a0bcb63e61 100644 --- a/mod/quiz/locallib.php +++ b/mod/quiz/locallib.php @@ -2580,7 +2580,7 @@ function quiz_retrieve_tags_for_slot_ids($slotids) { } } - $carry[$slottag->slotid][] = $slottag; + $carry[$slottag->slotid][$slottag->id] = $slottag; return $carry; }, $emptytagids