From bf4fb3b3177332378a468b710af4fc745f400d06 Mon Sep 17 00:00:00 2001
From: Andreas Grabs <moodle@grabs-edv.de>
Date: Tue, 10 Apr 2012 00:26:08 +0200
Subject: [PATCH] MDL-32316 feedback: fix tem type label does honor trusted
 text

---
 mod/feedback/item/label/label_form.php | 2 +-
 mod/feedback/item/label/lib.php        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mod/feedback/item/label/label_form.php b/mod/feedback/item/label/label_form.php
index bb2c1cb8712..7a44530c5ee 100644
--- a/mod/feedback/item/label/label_form.php
+++ b/mod/feedback/item/label/label_form.php
@@ -42,7 +42,7 @@ class feedback_label_form extends feedback_item_form {
 
         $mform->addElement('header', 'general', get_string($this->type, 'feedback'));
         $mform->addElement('editor', 'presentation_editor', '', null, $presentationoptions);
-        $mform->setType('presentation_editor', PARAM_CLEANHTML);
+        $mform->setType('presentation_editor', PARAM_RAW);
 
         parent::definition();
         $this->set_data($item);
diff --git a/mod/feedback/item/label/lib.php b/mod/feedback/item/label/lib.php
index f1dcd28567d..25c62a9f55d 100644
--- a/mod/feedback/item/label/lib.php
+++ b/mod/feedback/item/label/lib.php
@@ -167,7 +167,8 @@ class feedback_item_label extends feedback_item_base {
                                                $filearea,
                                                $item->id);
 
-        echo format_text($output, FORMAT_HTML, array('overflowdiv'=>true));
+        $formatoptions = array('overflowdiv'=>true, 'trusted'=>$CFG->enabletrusttext);
+        echo format_text($output, FORMAT_HTML, $formatoptions);
     }
 
     /**