Merge branch 'MDL-44952-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE

2016-02-29 16:34:24 +08:00
parent 9125eef5b4 6ca319debc
commit 0e88a593fd
2 changed files with 2 additions and 1 deletions
@@ -578,7 +578,7 @@ class feedback_item_multichoice extends feedback_item_base {
            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;
        }

@@ -63,6 +63,7 @@ class feedback_multichoice_form extends feedback_item_form {
        $mform->addElement('selectyesno',
                           'hidenoselect',
                           get_string('hide_no_select_option', 'feedback'));
+        $mform->disabledIf('hidenoselect', 'subtype', 'ne', 'r');

        $mform->addElement('static',
                           'hint',