L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-55019-31' of git://github.com/jleyva/moodle into MOODLE_31_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2016-07-04 15:29:45 +01:00
parent 8cba7fda3a b36b4f05c7
commit a933f85a73
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/externallib.php
+3 -1
View File
@@ -195,9 +195,11 @@ class core_course_external extends external_api {
$sectionvalues['id'] = $section->id;
$sectionvalues['name'] = get_section_name($course, $section);
$sectionvalues['visible'] = $section->visible;
$options = (object) array('noclean' => true);
list($sectionvalues['summary'], $sectionvalues['summaryformat']) =
external_format_text($section->summary, $section->summaryformat,
$context->id, 'course', 'section', $section->id);
$context->id, 'course', 'section', $section->id, $options);
$sectioncontents = array();
//for each module of the section
course/tests/externallib_test.php
+7
View File
@@ -686,6 +686,7 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
* @return array A list with the course object and course modules objects
*/
private function prepare_get_course_contents_test() {
global $DB;
$course = self::getDataGenerator()->create_course();
$forumdescription = 'This is the forum description';
$forum = $this->getDataGenerator()->create_module('forum',
@@ -710,6 +711,10 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$roleid = $this->assignUserCapability('moodle/course:view', $context->id);
$this->assignUserCapability('moodle/course:update', $context->id, $roleid);
$conditions = array('course' => $course->id, 'section' => 2);
$DB->set_field('course_sections', 'summary', 'Text with iframe <iframe src="https://moodle.org"></iframe>', $conditions);
rebuild_course_cache($course->id, true);
return array($course, $forumcm, $datacm, $pagecm, $labelcm, $urlcm);
}
@@ -753,6 +758,8 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
// Check that the only return section has the 5 created modules.
$this->assertCount(4, $firstsection['modules']);
$this->assertCount(1, $lastsection['modules']);
$this->assertContains('<iframe', $lastsection['summary']);
$this->assertContains('</iframe>', $lastsection['summary']);
try {
$sections = core_course_external::get_course_contents($course->id,