L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-32316_master_wip' of git://github.com/grabs/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2012-04-16 11:00:43 +12:00
parent 68c7673088 bf4fb3b317
commit b9afb90b7f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/feedback/item/label/label_form.php
+1 -1
View File
@@ -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);
mod/feedback/item/label/lib.php
+2 -1
View File
@@ -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);
}
/**