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

diff --combined mod/choice/lib.php
index 4e799c8,f0990d2..5d22112
--- 1/mod/choice/lib.php
--- 2/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@@ -112,8 -112,7 +112,8 @@@ function choice_user_complete($course, 
   * @return int
   */
  function choice_add_instance($choice) {
 -    global $DB;
 +    global $DB, $CFG;
 +    require_once($CFG->dirroot.'/mod/choice/locallib.php');
  
      $choice->timemodified = time();
  
@@@ -138,9 -137,6 +138,9 @@@
          }
      }
  
 +    // Add calendar events if necessary.
 +    choice_set_events($choice);
 +
      return $choice->id;
  }
  
@@@ -154,8 -150,7 +154,8 @@@
   * @return bool
   */
  function choice_update_instance($choice) {
 -    global $DB;
 +    global $DB, $CFG;
 +    require_once($CFG->dirroot.'/mod/choice/locallib.php');
  
      $choice->id = $choice->instance;
      $choice->timemodified = time();
@@@ -180,8 -175,11 +180,11 @@@
              $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 <> '') {
@@@ -190,9 -188,6 +193,9 @@@
          }
      }
  
 +    // Add calendar events if necessary.
 +    choice_set_events($choice);
 +
      return $DB->update_record('choice', $choice);
  
  }
@@@ -600,10 -595,6 +603,10 @@@ function choice_delete_instance($id) 
      if (! $DB->delete_records("choice", array("id"=>"$choice->id"))) {
          $result = false;
      }
 +    // Remove old calendar events.
 +    if (! $DB->delete_records('event', array('modulename' => 'choice', 'instance' => $choice->id))) {
 +        $result = false;
 +    }
  
      return $result;
  }
@@@ -1081,34 -1072,3 +1084,34 @@@ function choice_get_availability_status
      // Choice is available.
      return array($available, $warnings);
  }
 +
 +/**
 + * This standard function will check all instances of this module
 + * and make sure there are up-to-date events created for each of them.
 + * If courseid = 0, then every chat event in the site is checked, else
 + * only chat events belonging to the course specified are checked.
 + * This function is used, in its new format, by restore_refresh_events()
 + *
 + * @param int $courseid
 + * @return bool
 + */
 +function choice_refresh_events($courseid = 0) {
 +    global $DB, $CFG;
 +    require_once($CFG->dirroot.'/mod/choice/locallib.php');
 +
 +    if ($courseid) {
 +        if (! $choices = $DB->get_records("choice", array("course" => $courseid))) {
 +            return true;
 +        }
 +    } else {
 +        if (! $choices = $DB->get_records("choice")) {
 +            return true;
 +        }
 +    }
 +
 +    foreach ($choices as $choice) {
 +        choice_set_events($choice);
 +    }
 +    return true;
 +}
 +