MDL-17524 Merging from HEAD

Deleting a calculated question delete datasetdefinitions shared by other question
moodle · Dec 4, 2008 · 3e31f4e · 3e31f4e
1 parent 56f31bc
commit 3e31f4e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/question/type/calculated/questiontype.php b/question/type/calculated/questiontype.php
@@ -465,8 +465,13 @@ function delete_question($questionid) {
         delete_records("question_numerical_units", "question", $questionid);
         if ($datasets = get_records('question_datasets', 'question', $questionid)) {
             foreach ($datasets as $dataset) {
-                delete_records('question_dataset_definitions', 'id', $dataset->datasetdefinition);
-                delete_records('question_dataset_items', 'definition', $dataset->datasetdefinition);
+                if (! get_records_select(
+                        'question_datasets',
+                        "question != $questionid
+                        AND datasetdefinition = $dataset->datasetdefinition;")){                                 
+                    delete_records('question_dataset_definitions', 'id', $dataset->datasetdefinition);
+                    delete_records('question_dataset_items', 'definition', $dataset->datasetdefinition);
+                }
             }
         }
         delete_records("question_datasets", "question", $questionid);