MDL-32316 feedback: fix tem type label does honor trusted text

This commit is contained in:
Andreas Grabs
2012-04-10 00:29:29 +02:00
parent 4b3ee4fc55
commit c5c7879f8b
2 changed files with 4 additions and 2 deletions
+1 -1
View File
@@ -29,7 +29,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);
+3 -1
View File
@@ -135,7 +135,9 @@ class feedback_item_label extends feedback_item_base {
$item->presentationtrust = 1;
$output = file_rewrite_pluginfile_urls($item->presentation, 'pluginfile.php', $context->id, 'mod_feedback', $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);
}
/**