mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 16:04:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-63512-master' of git://github.com/peterRd/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2018-12-19 09:48:46 +08:00
commit 54fbe39ee1
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/lesson/continue.php
View File

@ -92,7 +92,7 @@ if ($lesson->ongoing && !$reviewmode) {
echo $lessonoutput->ongoing_score($lesson);
}
if (!$reviewmode) {
echo format_text($result->feedback, FORMAT_MOODLE, array('context' => $context));
echo format_text($result->feedback, FORMAT_MOODLE, array('context' => $context, 'noclean' => true));
}
// User is modifying attempts - save button and some instructions

14
mod/lesson/locallib.php
View File

@ -4181,7 +4181,7 @@ abstract class lesson_page extends lesson_base {
foreach ($studentanswerresponse as $answer => $response) {
// Add a table row containing the answer.
$studentanswer = $this->format_answer($answer, $context, $result->studentanswerformat);
$studentanswer = $this->format_answer($answer, $context, $result->studentanswerformat, $options);
$table->data[] = array($studentanswer);
// If the response exists, add a table row containing the response. If not, add en empty row.
if (!empty(trim($response))) {
@ -4195,7 +4195,7 @@ abstract class lesson_page extends lesson_base {
}
} else {
// Add a table row containing the answer.
$studentanswer = $this->format_answer($result->studentanswer, $context, $result->studentanswerformat);
$studentanswer = $this->format_answer($result->studentanswer, $context, $result->studentanswerformat, $options);
$table->data[] = array($studentanswer);
// If the response exists, add a table row containing the response. If not, add en empty row.
if (!empty(trim($result->response))) {
@ -4223,9 +4223,15 @@ abstract class lesson_page extends lesson_base {
* @param int $answerformat
* @return string Returns formatted string
*/
private function format_answer($answer, $context, $answerformat) {
private function format_answer($answer, $context, $answerformat, $options = []) {
return format_text($answer, $answerformat, array('context' => $context, 'para' => true));
if (empty($options)) {
$options = [
'context' => $context,
'para' => true
];
}
return format_text($answer, $answerformat, $options);
}
/**