Merge branch 'm26_MDL-47404' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE

2014-10-01 15:38:02 +13:00
parent 2437dac26a 6b84a536e8
commit 724aa37de9
1 changed files with 4 additions and 1 deletions
@@ -2448,7 +2448,10 @@ function send_stored_file($stored_file, $lifetime=null, $filter=0, $forcedownloa

    if ($forcedownload) {
        header('Content-Disposition: attachment; filename="'.$filename.'"');
-    } else {
+    } else if ($mimetype !== 'application/x-shockwave-flash') {
+        // If this is an swf don't pass content-disposition with filename as this makes the flash player treat the file
+        // as an upload and enforces security that may prevent the file from being loaded.
+
        header('Content-Disposition: inline; filename="'.$filename.'"');
    }