Merge branch 'wip-MDL-22955-m24' of git://github.com/samhemelryk/moodle

2012-10-10 00:35:11 +02:00
parent 49b1c61e5e 27c1c305b1
commit dbaf9d448d
11 changed files with 443 additions and 46 deletions
@@ -3784,7 +3784,7 @@ function file_pluginfile($relativepath, $forcedownload, $preview = null) {
                }
                // no redirect here because it is not cached
                $theme = theme_config::load($themename);
-                $imagefile = $theme->resolve_image_location('u/'.$filename, 'moodle');
+                $imagefile = $theme->resolve_image_location('u/'.$filename, 'moodle', null);
                send_file($imagefile, basename($imagefile), 60*60*24*14);
            }