Merge branch 'MDL-66900' of https://github.com/paulholden/moodle

diff --git a/course/classes/editcategory_form.php b/course/classes/editcategory_form.php
index 2e58af3..f11d28c 100644 (file)
--- a/course/classes/editcategory_form.php
+++ b/course/classes/editcategory_form.php
@@ -75,6 +75,7 @@ class core_course_editcategory_form extends moodleform {
 
         $mform->addElement('editor', 'description_editor', get_string('description'), null,
             $this->get_description_editor_options());
+        $mform->setType('description_editor', PARAM_RAW);
 
         if (!empty($CFG->allowcategorythemes)) {
             $themes = array(''=>get_string('forceno'));
@@ -105,7 +106,8 @@ class core_course_editcategory_form extends moodleform {
         return array(
             'maxfiles'  => EDITOR_UNLIMITED_FILES,
             'maxbytes'  => $CFG->maxbytes,
-            'trusttext' => true,
+            'trusttext' => false,
+            'noclean'   => true,
             'context'   => $context,
             'subdirs'   => file_area_contains_subdirs($context, 'coursecat', 'description', $itemid),
         );