moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-44952-master' of git://github.com/marinaglancy/moodle

Browse source
This commit is contained in:
Dan Poltawski 2016-02-29 16:34:22 +08:00
commit b70b436875
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mod/feedback/item/multichoice/lib.php
View file

@ -578,7 +578,7 @@ class feedback_item_multichoice extends feedback_item_base {
return true; 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; return false;
} }

1
mod/feedback/item/multichoice/multichoice_form.php
View file

@ -63,6 +63,7 @@ class feedback_multichoice_form extends feedback_item_form {
$mform->addElement('selectyesno', $mform->addElement('selectyesno',
'hidenoselect', 'hidenoselect',
get_string('hide_no_select_option', 'feedback')); get_string('hide_no_select_option', 'feedback'));
$mform->disabledIf('hidenoselect', 'subtype', 'ne', 'r');
$mform->addElement('textarea', 'values', get_string('multichoice_values', 'feedback'), $mform->addElement('textarea', 'values', get_string('multichoice_values', 'feedback'),
'wrap="virtual" rows="10" cols="65"'); 'wrap="virtual" rows="10" cols="65"');