moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 20:06:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-51419-35' of https://github.com/snake/moodle into MOODLE_35_STABLE

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2018-06-26 02:41:59 +02:00
commit 6545e50f62
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/excellib.class.php
View file

@ -116,7 +116,7 @@ class MoodleExcelWorkbook {
header('Pragma: no-cache');
}
if (core_useragent::is_ie()) {
if (core_useragent::is_ie() || core_useragent::is_edge()) {
$filename = rawurlencode($filename);
} else {
$filename = s($filename);

4
lib/filelib.php
View file

@ -2115,7 +2115,7 @@ function send_temp_file($path, $filename, $pathisstring=false) {
}
// if user is using IE, urlencode the filename so that multibyte file name will show up correctly on popup
if (core_useragent::is_ie()) {
if (core_useragent::is_ie() || core_useragent::is_edge()) {
$filename = urlencode($filename);
}
@ -2264,7 +2264,7 @@ function send_file($path, $filename, $lifetime = null , $filter=0, $pathisstring
}
// if user is using IE, urlencode the filename so that multibyte file name will show up correctly on popup
if (core_useragent::is_ie()) {
if (core_useragent::is_ie() || core_useragent::is_edge()) {
$filename = rawurlencode($filename);
}