From 79189e975cb88a45ce9c98cd12acb0266502611d Mon Sep 17 00:00:00 2001
From: Josh Ebarvia <josh.ebarvia@blackboard.com>
Date: Wed, 21 Jun 2017 11:44:41 +0930
Subject: [PATCH] MDL-51745 mod_lesson: Use format_text in response feedback

---
 mod/lesson/continue.php |  2 +-
 mod/lesson/locallib.php | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/mod/lesson/continue.php b/mod/lesson/continue.php
index a743dc773e9..934e9f5176f 100644
--- a/mod/lesson/continue.php
+++ b/mod/lesson/continue.php
@@ -92,7 +92,7 @@ if ($lesson->ongoing && !$reviewmode) {
     echo $lessonoutput->ongoing_score($lesson);
 }
 if (!$reviewmode) {
-    echo $result->feedback;
+    echo format_text($result->feedback, FORMAT_MOODLE, array('context' => $context));
 }
 
 // User is modifying attempts - save button and some instructions
diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index 7c7c3792b93..82560041fee 100644
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -4091,13 +4091,8 @@ abstract class lesson_page extends lesson_base {
 
                 $result->feedback .= $OUTPUT->box(format_text($this->get_contents(), $this->properties->contentsformat, $options),
                         'generalbox boxaligncenter');
-                if (isset($result->studentanswerformat)) {
-                    // This is the student's answer so it should be cleaned.
-                    $studentanswer = format_text($result->studentanswer, $result->studentanswerformat,
-                            array('context' => $context, 'para' => true));
-                } else {
-                    $studentanswer = format_string($result->studentanswer);
-                }
+                $studentanswer = format_text($result->studentanswer, $result->studentanswerformat,
+                        array('context' => $context, 'para' => true));
                 $result->feedback .= '<div class="correctanswer generalbox"><em>'
                         . get_string("youranswer", "lesson").'</em> : ' . $studentanswer;
                 if (isset($result->responseformat)) {
@@ -4476,6 +4471,7 @@ abstract class lesson_page extends lesson_base {
         $result->response        = '';
         $result->newpageid       = 0;       // stay on the page
         $result->studentanswer   = '';      // use this to store student's answer(s) in order to display it on feedback page
+        $result->studentanswerformat = FORMAT_MOODLE;
         $result->userresponse    = null;
         $result->feedback        = '';
         $result->nodefaultresponse  = false; // Flag for redirecting when default feedback is turned off