Merge branch 'MDL-58434-master' of git://github.com/jleyva/moodle

This commit is contained in:
Dan Poltawski 2017-05-03 14:01:59 +01:00
commit a724a97f25

View file

@ -215,8 +215,9 @@ class lesson_page_type_numerical extends lesson_page {
$answerdata->answers[] = array(get_string("nooneansweredthisquestion", "lesson"), " "); $answerdata->answers[] = array(get_string("nooneansweredthisquestion", "lesson"), " ");
} }
$i++; $i++;
} else if ($useranswer != null && ($answer->id == $useranswer->answerid || ($answer == end($answers) && empty($answerdata)))) { } else if ($useranswer != null && ($answer->id == $useranswer->answerid || ($answer == end($answers) &&
// get in here when what the user entered is not one of the answers empty($answerdata->answers)))) {
// Get in here when the user answered or for the last answer.
$data = '<input class="form-control" type="text" size="50" ' . $data = '<input class="form-control" type="text" size="50" ' .
'disabled="disabled" readonly="readonly" value="'.s($useranswer->useranswer).'">'; 'disabled="disabled" readonly="readonly" value="'.s($useranswer->useranswer).'">';
if (isset($pagestats[$this->properties->id][$useranswer->useranswer])) { if (isset($pagestats[$this->properties->id][$useranswer->useranswer])) {