Merge branch 'MDL-44952-29' of git://github.com/marinaglancy/moodle i…

…nto MOODLE_29_STABLE
moodle · Feb 29, 2016 · 05392ca · 05392ca
2 parents fc47609 + 0f94bbe
commit 05392ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php
@@ -578,7 +578,7 @@ public function check_value($value, $item) {
             return true;
         }
 
-        if (!isset($value) OR !is_array($value) OR $value[0] == '' OR $value[0] == 0) {
+        if (empty($value) OR !is_array($value) OR $value[0] == '' OR $value[0] == 0) {
             return false;
         }
 

diff --git a/mod/feedback/item/multichoice/multichoice_form.php b/mod/feedback/item/multichoice/multichoice_form.php
@@ -63,6 +63,7 @@ public function definition() {
         $mform->addElement('selectyesno',
                            'hidenoselect',
                            get_string('hide_no_select_option', 'feedback'));
+        $mform->disabledIf('hidenoselect', 'subtype', 'ne', 'r');
 
         $mform->addElement('static',
                            'hint',