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

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

Browse Source
This commit is contained in:
Sam Hemelryk
2012-04-16 11:00:16 +12:00
parent 84aabeae85 c5c7879f8b
commit a38d62efd8
2 changed files with 4 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
@@ -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);
mod/feedback/item/label/lib.php
+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);
}
/**