Permalink
Browse files

Merge branch 'MDL-32316_22_wip' of git://github.com/grabs/moodle into…

… MOODLE_22_STABLE
  • Loading branch information...
Sam Hemelryk
Sam Hemelryk committed Apr 15, 2012
2 parents b182c12 + eb11030 commit cb36e6ba4ab9e130c0d4d73003bd05551839b4ba
Showing with 3 additions and 2 deletions.
  1. +1 −1 mod/feedback/item/label/label_form.php
  2. +2 −1 mod/feedback/item/label/lib.php
@@ -42,7 +42,7 @@ public function definition() {
$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);
@@ -167,7 +167,8 @@ public function print_item($item) {
$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);
}
/**

0 comments on commit cb36e6b

Please sign in to comment.