Merge branch 'wip-MDL-55154-30' of git://github.com/abgreeve/moodle i…

…nto MOODLE_30_STABLE
moodle · Jul 11, 2016 · 01a64e0 · 01a64e0
2 parents eb0ac9c + 40e1059
commit 01a64e0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/mod/lesson/pagetypes/numerical.php b/mod/lesson/pagetypes/numerical.php
@@ -79,6 +79,10 @@ public function check_answer() {
         $data = $mform->get_data();
         require_sesskey();
 
+        $formattextdefoptions = new stdClass();
+        $formattextdefoptions->noclean = true;
+        $formattextdefoptions->para = false;
+
         // set defaults
         $result->response = '';
         $result->newpageid = 0;
@@ -93,6 +97,7 @@ public function check_answer() {
         $result->studentanswer = $result->userresponse = $result->useranswer;
         $answers = $this->get_answers();
         foreach ($answers as $answer) {
+            $answer = parent::rewrite_answers_urls($answer);
             if (strpos($answer->answer, ':')) {
                 // there's a pairs of values
                 list($min, $max) = explode(':', $answer->answer);
@@ -105,7 +110,7 @@ public function check_answer() {
             }
             if (($result->useranswer >= $minimum) && ($result->useranswer <= $maximum)) {
                 $result->newpageid = $answer->jumpto;
-                $result->response = trim($answer->response);
+                $result->response = format_text($answer->response, $answer->responseformat, $formattextdefoptions);
                 if ($this->lesson->jumpto_is_correct($this->properties->id, $result->newpageid)) {
                     $result->correctanswer = true;
                 }