Merge branch 'MDL-60320_33' of git://github.com/aolley/moodle into MOODLE_33_STABLE

This commit is contained in:
Eloy Lafuente (stronk7)
2017-10-17 00:06:03 +02:00
+1 -1
View File
@@ -2369,7 +2369,7 @@ function send_stored_file($stored_file, $lifetime=null, $filter=0, $forcedownloa
$size = 256;
}
$fileicon = file_file_icon($stored_file, $size);
send_file($CFG->dirroot.'/pix/'.$fileicon.'.svg', basename($fileicon).'.svg');
send_file($CFG->dirroot.'/pix/'.$fileicon.'.png', basename($fileicon).'.png');
} else {
// preview images have fixed cache lifetime and they ignore forced download
// (they are generated by GD and therefore they are considered reasonably safe).