Merge branch 'MDL-53803_m32v1' of https://github.com/sbourget/moodle

[moodle.git] / mod / choice / lib.php

diff --git a/mod/choice/lib.php b/mod/choice/lib.php
index 4e799c8..5d22112 100644 (file)
--- a/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@ -180,8 +180,11 @@ function choice_update_instance($choice) {
             $option->id=$choice->optionid[$key];
             if (isset($value) && $value <> '') {
                 $DB->update_record("choice_options", $option);
             $option->id=$choice->optionid[$key];
             if (isset($value) && $value <> '') {
                 $DB->update_record("choice_options", $option);

-            } else { //empty old option - needs to be deleted.
-                $DB->delete_records("choice_options", array("id"=>$option->id));
+            } else {
+                // Remove the empty (unused) option.
+                $DB->delete_records("choice_options", array("id" => $option->id));
+                // Delete any answers associated with this option.
+                $DB->delete_records("choice_answers", array("choiceid" => $choice->id, "optionid" => $option->id));

             }
         } else {
             if (isset($value) && $value <> '') {
             }
         } else {
             if (isset($value) && $value <> '') {