Merge branch 'MDL-38528' of git://github.com/timhunt/moodle

question/type/calculated/datasetdefinitions_form.php

@@ -71,7 +71,10 @@ class question_dataset_dependent_definitions_form extends question_wizard_form {
 
     protected function definition() {
         global $SESSION;
+
         $mform = $this->_form;
+        $mform->setDisableShortforms();
+
         $possibledatasets = $this->qtypeobj->find_dataset_names($this->question->questiontext);
         $mandatorydatasets = array();
         if (isset($this->question->options->answers)) {

question/type/calculated/datasetitems_form.php

@@ -111,6 +111,8 @@ class question_dataset_dependent_items_form extends question_wizard_form {
                 $labelsharedwildcard = get_string("sharedwildcard", "qtype_calculated");
 
         $mform =& $this->_form;
+        $mform->setDisableShortforms();
+
         $strquestionlabel = $this->qtypeobj->comment_header($this->question);
         if ($this->maxnumber != -1 ) {
             $this->noofitems = $this->maxnumber;