Merge branch 'MDL-43401-26' of git://github.com/FMCorz/moodle into MO…

…ODLE_26_STABLE
moodle · Jan 21, 2014 · a45dbb2 · a45dbb2
2 parents f973e5f + 750f660
commit a45dbb2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php
@@ -885,7 +885,11 @@ function lesson_pluginfile($course, $cm, $context, $filearea, $args, $forcedownl
         $fullpath = "/$context->id/mod_lesson/$filearea/$pageid/".implode('/', $args);
 
     } else if ($filearea === 'mediafile') {
-        array_shift($args); // ignore itemid - caching only
+        if (count($args) > 1) {
+            // Remove the itemid when it appears to be part of the arguments. If there is only one argument
+            // then it is surely the file name. The itemid is sometimes used to prevent browser caching.
+            array_shift($args);
+        }
         $fullpath = "/$context->id/mod_lesson/$filearea/0/".implode('/', $args);
 
     } else {