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

This commit is contained in:
Eloy Lafuente (stronk7) 2017-10-17 00:05:54 +02:00
commit 39dce3073f

View File

@ -2425,7 +2425,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).