L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2018-06-26 02:42:34 +02:00
parent 7b1139543c 8e6d95b9cf
commit 30fca6d09c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/excellib.class.php
+1 -1
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);
lib/filelib.php
+2 -2
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);
}