From b70c364a7f9d9a906f0cd53c0ba5dbcdd44d4423 Mon Sep 17 00:00:00 2001 From: Adrian Greeve Date: Fri, 7 Dec 2018 10:16:17 +0100 Subject: [PATCH] MDL-64346 mod_resource: Fix problems with # in file name. --- mod/resource/locallib.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mod/resource/locallib.php b/mod/resource/locallib.php index 7629859ea4f01..e5abb02d0eaa4 100644 --- a/mod/resource/locallib.php +++ b/mod/resource/locallib.php @@ -66,9 +66,8 @@ function resource_display_embed($resource, $cm, $course, $file) { $clicktoopen = resource_get_clicktoopen($file, $resource->revision); $context = context_module::instance($cm->id); - $path = '/'.$context->id.'/mod_resource/content/'.$resource->revision.$file->get_filepath().$file->get_filename(); - $fullurl = file_encode_url($CFG->wwwroot.'/pluginfile.php', $path, false); - $moodleurl = new moodle_url('/pluginfile.php' . $path); + $moodleurl = moodle_url::make_pluginfile_url($context->id, 'mod_resource', 'content', $resource->revision, + $file->get_filepath(), $file->get_filename()); $mimetype = $file->get_mimetype(); $title = $resource->name; @@ -82,11 +81,11 @@ function resource_display_embed($resource, $cm, $course, $file) { ); if (file_mimetype_in_typegroup($mimetype, 'web_image')) { // It's an image - $code = resourcelib_embed_image($fullurl, $title); + $code = resourcelib_embed_image($moodleurl->out(), $title); } else if ($mimetype === 'application/pdf') { // PDF document - $code = resourcelib_embed_pdf($fullurl, $title, $clicktoopen); + $code = resourcelib_embed_pdf($moodleurl->out(), $title, $clicktoopen); } else if ($mediamanager->can_embed_url($moodleurl, $embedoptions)) { // Media (audio/video) file.