L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-63512 mod_lesson: Fix video links provided in feedback

Browse Source
This commit is contained in:
Peter
2018-12-14 10:27:24 +08:00
parent 11d0c68d56
commit 54ff8c77bf
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lesson/continue.php
+1 -1
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
mod/lesson/locallib.php
+10 -4
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);
}
/**