moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-47690-master' of git://github.com/jleyva/moodle

Browse source
This commit is contained in:
Damyon Wiese 2014-10-27 11:11:53 +08:00
commit d2dbc373f8
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
course/tests/externallib_test.php
View file

@ -589,7 +589,9 @@ class core_course_externallib_testcase extends externallib_advanced_testcase {
$label = $this->getDataGenerator()->create_module('label', array('course' => $course->id,
'intro' => $labeldescription));
$labelcm = get_coursemodule_from_instance('label', $label->id);
$url = $this->getDataGenerator()->create_module('url', array('course' => $course->id));
$url = $this->getDataGenerator()->create_module('url', array('course' => $course->id,
'name' => 'URL: % & $ ../'));
$urlcm = get_coursemodule_from_instance('url', $url->id);
// Set the required capabilities by the external function.
$context = context_course::instance($course->id);

2
mod/url/lib.php
View file

@ -274,7 +274,7 @@ function url_export_contents($cm, $baseurl) {
$url = array();
$url['type'] = 'url';
$url['filename'] = $urlrecord->name;
$url['filename'] = clean_param(format_string($urlrecord->name), PARAM_FILE);
$url['filepath'] = null;
$url['filesize'] = 0;
$url['fileurl'] = $fullurl;