From 4ed5fc5efa30bd69fca8642f4b60685cfc225902 Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Thu, 1 Sep 2016 20:19:11 +0800
Subject: [PATCH] MDL-55832 mod_feedback: apply filters to multichoice
 quesitons

---
 mod/feedback/item/multichoice/lib.php      | 8 ++++----
 mod/feedback/item/multichoicerated/lib.php | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php
index bd15d3e10c0..dd561a95c3e 100644
--- a/mod/feedback/item/multichoice/lib.php
+++ b/mod/feedback/item/multichoice/lib.php
@@ -110,7 +110,7 @@ class feedback_item_multichoice extends feedback_item_base {
 
         $analysed_item = array();
         $analysed_item[] = $item->typ;
-        $analysed_item[] = $item->name;
+        $analysed_item[] = format_string($item->name);
 
         //get the possible answers
         $answers = null;
@@ -183,7 +183,7 @@ class feedback_item_multichoice extends feedback_item_base {
             for ($i = 0; $i < $sizeofvallist; $i++) {
                 for ($k = 0; $k < $sizeofpresentation; $k++) {
                     if ($vallist[$i] == ($k + 1)) {//Die Werte beginnen bei 1, das Array aber mit 0
-                        $printval .= trim($presentation[$k]) . chr(10);
+                        $printval .= trim(format_string($presentation[$k])) . chr(10);
                         break;
                     }
                 }
@@ -192,7 +192,7 @@ class feedback_item_multichoice extends feedback_item_base {
             $index = 1;
             foreach ($presentation as $pres) {
                 if ($value->value == $index) {
-                    $printval = $pres;
+                    $printval = format_string($pres);
                     break;
                 }
                 $index++;
@@ -212,7 +212,7 @@ class feedback_item_multichoice extends feedback_item_base {
             if (strval($item->label) !== '') {
                 echo '('. format_string($item->label).') ';
             }
-            echo $itemname;
+            echo format_string($itemname);
             echo '</th></tr>';
 
             $analysed_vals = $analysed_item[2];
diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php
index 6e59f1ef75d..921af5ebb69 100644
--- a/mod/feedback/item/multichoicerated/lib.php
+++ b/mod/feedback/item/multichoicerated/lib.php
@@ -166,7 +166,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
         foreach ($presentation as $pres) {
             if ($value->value == $index) {
                 $item_label = explode(FEEDBACK_MULTICHOICERATED_VALUE_SEP, $pres);
-                $printval = $item_label[1];
+                $printval = format_string($item_label[1]);
                 break;
             }
             $index++;
@@ -183,7 +183,7 @@ class feedback_item_multichoicerated extends feedback_item_base {
             if (strval($item->label) !== '') {
                 echo '('. format_string($item->label).') ';
             }
-            echo $analysed_item[1];
+            echo format_string($analysed_item[1]);
             echo '</th></tr>';
             $analysed_vals = $analysed_item[2];
             $pixnr = 0;