MDL-63512 mod_lesson: Fix video links provided in feedback
authorPeter <peter@moodle.com>
Mon, 10 Dec 2018 23:56:50 +0000 (07:56 +0800)
committerPeter <peter@moodle.com>
Fri, 14 Dec 2018 02:26:00 +0000 (10:26 +0800)
mod/lesson/continue.php
mod/lesson/locallib.php

index 934e9f5..9960daf 100644 (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
index d775cc2..c65a6ca 100644 (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);
     }
 
     /**