From 95356cd73c9782df7fd1ac8b26d09d7d80a3cdbf Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 19 Sep 2016 11:33:55 +0200
Subject: [PATCH] MDL-56019 ws: Use itemid null when getting modules intro

---
 mod/forum/externallib.php      | 2 +-
 mod/lti/classes/external.php   | 2 +-
 mod/scorm/classes/external.php | 2 +-
 mod/wiki/classes/external.php  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mod/forum/externallib.php b/mod/forum/externallib.php
index 5f8c26f4c91..9b3daffcb5e 100644
--- a/mod/forum/externallib.php
+++ b/mod/forum/externallib.php
@@ -91,7 +91,7 @@ class mod_forum_external extends external_api {
                 $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);
                 // Discussions count. This function does static request cache.
                 $forum->numdiscussions = forum_count_discussions($forum, $cm, $course);
                 $forum->cmid = $forum->coursemodule;
diff --git a/mod/lti/classes/external.php b/mod/lti/classes/external.php
index e45c0f3b150..a38ac4697ed 100644
--- a/mod/lti/classes/external.php
+++ b/mod/lti/classes/external.php
@@ -307,7 +307,7 @@ class mod_lti_external extends external_api {
                 $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);
 
                     $viewablefields = array('launchcontainer', 'showtitlelaunch', 'showdescriptionlaunch', 'icon', 'secureicon');
                 }
diff --git a/mod/scorm/classes/external.php b/mod/scorm/classes/external.php
index ab8e166643f..4d9df9ac52b 100644
--- a/mod/scorm/classes/external.php
+++ b/mod/scorm/classes/external.php
@@ -692,7 +692,7 @@ class mod_scorm_external extends external_api {
                 $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);
 
                 // Check if the SCORM open and return warnings if so.
                 list($open, $openwarnings) = scorm_get_availability_status($scorm, true, $context);
diff --git a/mod/wiki/classes/external.php b/mod/wiki/classes/external.php
index 2a33a84def8..87f491cb876 100644
--- a/mod/wiki/classes/external.php
+++ b/mod/wiki/classes/external.php
@@ -103,7 +103,7 @@ class mod_wiki_external extends external_api {
                 $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);
 
                     $viewablefields = array('firstpagetitle', 'wikimode', 'defaultformat', 'forceformat', 'editbegin', 'editend',
                                             'section', 'visible', 'groupmode', 'groupingid');