Permalink
Browse files

Merge branch 'MDL-60377-33' of git://github.com/jleyva/moodle into MO…

…ODLE_33_STABLE
  • Loading branch information...
dmonllao committed Oct 30, 2017
2 parents e789d41 + 0f08e89 commit 20668b9a8a1c22e7508f2d1da165aec12c3c4243
Showing with 4 additions and 2 deletions.
  1. +2 −1 course/externallib.php
  2. +2 −1 mod/page/classes/external.php
@@ -268,8 +268,9 @@ public static function get_course_contents($courseid, $options = array()) {
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
@@ -161,8 +161,9 @@ public static function get_pages_by_courses($courseids = array()) {
$page->introformat, $context->id, 'mod_page', 'intro', null);
$page->introfiles = external_util::get_area_files($context->id, 'mod_page', 'intro', false, false);
$options = array('noclean' => true);
list($page->content, $page->contentformat) = external_format_text($page->content, $page->contentformat,
$context->id, 'mod_page', 'content', $page->revision);
$context->id, 'mod_page', 'content', $page->revision, $options);
$page->contentfiles = external_util::get_area_files($context->id, 'mod_page', 'content');
$returnedpages[] = $page;

0 comments on commit 20668b9

Please sign in to comment.