MDL-47690 web services: Fixed invalid return parameter type in mod_url

moodle · Oct 24, 2014 · deb9221 · deb9221
1 parent 3eeb536
commit deb9221
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/course/tests/externallib_test.php b/course/tests/externallib_test.php
@@ -582,7 +582,9 @@ public function test_get_course_contents() {
         $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);

diff --git a/mod/url/lib.php b/mod/url/lib.php
@@ -275,7 +275,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;