From 8ad534bd9fed444fbd01484a4e217fc1f2864da4 Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Mon, 22 Feb 2016 22:01:02 +0800
Subject: [PATCH] MDL-44952 mod_feedback: validate required multichoice

---
 mod/feedback/item/multichoice/lib.php              | 2 +-
 mod/feedback/item/multichoice/multichoice_form.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php
index 6332f6e10fe..026ca36c266 100644
--- a/mod/feedback/item/multichoice/lib.php
+++ b/mod/feedback/item/multichoice/lib.php
@@ -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;
         }
 
diff --git a/mod/feedback/item/multichoice/multichoice_form.php b/mod/feedback/item/multichoice/multichoice_form.php
index 6dd192dd6d9..3947171672e 100644
--- a/mod/feedback/item/multichoice/multichoice_form.php
+++ b/mod/feedback/item/multichoice/multichoice_form.php
@@ -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',