From 08eef20df4718892e51d656eb10bc1ade8f95fe9 Mon Sep 17 00:00:00 2001
From: tjhunt <tjhunt>
Date: Tue, 6 Mar 2007 18:00:23 +0000
Subject: [PATCH] MDL-8349 - responses not being filtered in history display.
 Merged from MOODLE_18_STABLE.

---
 question/type/multichoice/questiontype.php | 9 ++++++++-
 question/type/questiontype.php             | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/question/type/multichoice/questiontype.php b/question/type/multichoice/questiontype.php
index 86a3742864..5fb6d8f09a 100644
--- a/question/type/multichoice/questiontype.php
+++ b/question/type/multichoice/questiontype.php
@@ -376,9 +376,12 @@ class question_multichoice_qtype extends default_questiontype {
     // ULPGC ecastro
     function get_actual_response($question, $state) {
         $answers = $question->options->answers;
+        $responses = array();
         if (!empty($state->responses)) {
             foreach ($state->responses as $aid =>$rid){
-                $responses[] = (!empty($answers[$rid]) ? $answers[$rid]->answer : '');
+                if (!empty($answers[$rid])) {
+                    $responses[] = $this->format_text($answers[$rid]->answer, $question->questiontextformat);
+                }
             }
         } else {
             $responses[] = '';
@@ -386,6 +389,10 @@ class question_multichoice_qtype extends default_questiontype {
         return $responses;
     }
 
+    function response_summary($question, $state, $length = 80) {
+        return implode(',', $this->get_actual_response($question, $state));
+    }
+    
 /// BACKUP FUNCTIONS ////////////////////////////
 
     /*
diff --git a/question/type/questiontype.php b/question/type/questiontype.php
index 846e9d9f39..69cabe8b7c 100644
--- a/question/type/questiontype.php
+++ b/question/type/questiontype.php
@@ -1190,11 +1190,11 @@ class default_questiontype {
      * @param object $cmoptions the context the string is being displayed in. Only $cmoptions->course is used.
      * @return string the formatted text.
      */
-    function format_text($text, $textformat, $cmoptions) {
+    function format_text($text, $textformat, $cmoptions = NULL) {
         $formatoptions = new stdClass;
         $formatoptions->noclean = true;
         $formatoptions->para = false;
-        return format_text($text, $textformat, $formatoptions, $cmoptions->course);
+        return format_text($text, $textformat, $formatoptions, $cmoptions === NULL ? NULL : $cmoptions->course);
     }
 
 /// BACKUP FUNCTIONS ////////////////////////////
-- 
2.39.5