mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

MDL-66936 mod_url: revert MDL-65024 adding fullurl to modinfo

Browse Source 
This reverts commit cc56e409c3ab8e6b59e2f8fe4118b3f2b38160d0, reversing
changes made to 01cdf16c0e1c28372994342a393dbcbc27f01597.
This commit is contained in:
Marina Glancy 2019-12-03 12:24:03 +01:00
parent ec0d17b543
commit 3b0168ce7f
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
course/tests/externallib_test.php
View File

@ -964,7 +964,6 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
foreach ($sections[2]['modules'] as $module) {
if ($module['id'] == $urlcm->id and $module['modname'] == 'url') {
$this->assertContains('width=100,height=100', $module['onclick']);
$this->assertContains('moodle.org', $module['customdata']);
$testexecuted = $testexecuted + 1;
}
}

5
mod/url/lib.php
View File

@ -212,7 +212,7 @@ function url_get_coursemodule_info($coursemodule) {
require_once("$CFG->dirroot/mod/url/locallib.php");
if (!$url = $DB->get_record('url', array('id'=>$coursemodule->instance),
'id, name, course, display, displayoptions, externalurl, parameters, intro, introformat')) {
'id, name, display, displayoptions, externalurl, parameters, intro, introformat')) {
return NULL;
}
@ -243,9 +243,6 @@ function url_get_coursemodule_info($coursemodule) {
$info->content = format_module_intro('url', $url, $coursemodule->id, false);
}
$course = get_course($url->course); // Get cached course.
$info->customdata = array('fullurl' => str_replace('&', '&', url_get_full_url($url, $coursemodule, $course)));
return $info;
}