Merge branch 'MDL-36754-master' of git://github.com/andrewnicols/moodle

diff --git a/lib/filelib.php b/lib/filelib.php
index 01b360c..ded335b 100644 (file)
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -481,6 +481,7 @@ function file_rewrite_pluginfile_urls($text, $file, $contextid, $component, $fil
         $finalfile = basename($file);
         $tokenfile = "token{$finalfile}";
         $file = substr($file, 0, strlen($file) - strlen($finalfile)) . $tokenfile;
+        $baseurl = "{$CFG->wwwroot}/{$file}";
 
         if (!$CFG->slasharguments) {
             $baseurl .= "?token={$token}&file=";