Merge branch 'MDL-56019-master' of git://github.com/dpalou/moodle

robjoyce · Sep 28, 2016 · b3823c4 · b3823c4
2 parents 1138bbc + d33c67b
commit b3823c4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/mod/forum/externallib.php b/mod/forum/externallib.php
@@ -91,7 +91,7 @@ public static function get_forums_by_courses($courseids = array()) {
                 $forum->name = external_format_string($forum->name, $context->id);
                 // Format the intro before being returning using the format setting.
                 list($forum->intro, $forum->introformat) = external_format_text($forum->intro, $forum->introformat,
-                                                                                $context->id, 'mod_forum', 'intro', 0);
+                                                                                $context->id, 'mod_forum', 'intro', null);
                 $forum->introfiles = external_util::get_area_files($context->id, 'mod_forum', 'intro', false, false);
                 // Discussions count. This function does static request cache.
                 $forum->numdiscussions = forum_count_discussions($forum, $cm, $course);

diff --git a/mod/lti/classes/external.php b/mod/lti/classes/external.php
@@ -307,7 +307,7 @@ public static function get_ltis_by_courses($courseids = array()) {
                 $viewablefields = [];
                 if (has_capability('mod/lti:view', $context)) {
                     list($module['intro'], $module['introformat']) =
-                        external_format_text($lti->intro, $lti->introformat, $context->id, 'mod_lti', 'intro', $lti->id);
+                        external_format_text($lti->intro, $lti->introformat, $context->id, 'mod_lti', 'intro', null);
 
                     $module['introfiles'] = external_util::get_area_files($context->id, 'mod_lti', 'intro', false, false);
                     $viewablefields = array('launchcontainer', 'showtitlelaunch', 'showdescriptionlaunch', 'icon', 'secureicon');

diff --git a/mod/scorm/classes/external.php b/mod/scorm/classes/external.php
@@ -692,7 +692,7 @@ public static function get_scorms_by_courses($courseids = array()) {
                 $module['course'] = $scorm->course;
                 $module['name']  = external_format_string($scorm->name, $context->id);
                 list($module['intro'], $module['introformat']) =
-                    external_format_text($scorm->intro, $scorm->introformat, $context->id, 'mod_scorm', 'intro', $scorm->id);
+                    external_format_text($scorm->intro, $scorm->introformat, $context->id, 'mod_scorm', 'intro', null);
                 $module['introfiles'] = external_util::get_area_files($context->id, 'mod_scorm', 'intro', false, false);
 
                 // Check if the SCORM open and return warnings if so.

diff --git a/mod/wiki/classes/external.php b/mod/wiki/classes/external.php
@@ -103,7 +103,7 @@ public static function get_wikis_by_courses($courseids = array()) {
                 $viewablefields = [];
                 if (has_capability('mod/wiki:viewpage', $context)) {
                     list($module['intro'], $module['introformat']) =
-                        external_format_text($wiki->intro, $wiki->introformat, $context->id, 'mod_wiki', 'intro', $wiki->id);
+                        external_format_text($wiki->intro, $wiki->introformat, $context->id, 'mod_wiki', 'intro', null);
                     $module['introfiles'] = external_util::get_area_files($context->id, 'mod_wiki', 'intro', false, false);
 
                     $viewablefields = array('firstpagetitle', 'wikimode', 'defaultformat', 'forceformat', 'editbegin', 'editend',