Merge branch 'MDL-60377-master' of git://github.com/jleyva/moodle

diff --combined course/externallib.php
index 73e4b80,2ab6cb0..d3aba3b
--- 1/course/externallib.php
--- 2/course/externallib.php
+++ b/course/externallib.php
@@@ -268,8 -268,9 +268,9 @@@ class core_course_external extends exte
  
                          if (!empty($cm->showdescription) or $cm->modname == 'label') {
                              // We want to use the external format. However from reading get_formatted_content(), $cm->content format is always FORMAT_HTML.
+                             $options = array('noclean' => true);
                              list($module['description'], $descriptionformat) = external_format_text($cm->content,
-                                 FORMAT_HTML, $modcontext->id, $cm->modname, 'intro', $cm->id);
+                                 FORMAT_HTML, $modcontext->id, $cm->modname, 'intro', $cm->id, $options);
                          }
  
                          //url of the module
@@@ -3135,7 -3136,6 +3136,7 @@@
       */
      public static function check_updates($courseid, $tocheck, $filter = array()) {
          global $CFG, $DB;
 +        require_once($CFG->dirroot . "/course/lib.php");
  
          $params = self::validate_parameters(
              self::check_updates_parameters(),