Merge pull request #926 from sim1st/patch-1

cdujeu · cdujeu · commit d641046e63e9 · 2015-06-26T08:55:38.000+02:00
File name encoding when downloading in mode IE 11
diff --git a/core/src/core/classes/class.HTMLWriter.php b/core/src/core/classes/class.HTMLWriter.php
@@ -157,7 +157,7 @@ public static function javascriptErrorHandler($errorType, $errorMessage)
      */
     public static function generateAttachmentsHeader(&$attachmentName, $dataSize, $isFile=true, $gzip=false)
     {
-        if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT']) || preg_match('/ WebKit /',$_SERVER['HTTP_USER_AGENT'])) {
+        if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT']) || preg_match('/ WebKit /',$_SERVER['HTTP_USER_AGENT']) || preg_match(‘/ Trident/’,$_SERVER[‘HTTP_USER_AGENT’])) {
              $attachmentName = str_replace("+", " ", urlencode(SystemTextEncoding::toUTF8($attachmentName)));
          }
 

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public static function javascriptErrorHandler($errorType, $errorMessage)`
`157`	`157`	`*/`
`158`	`158`	`public static function generateAttachmentsHeader(&$attachmentName, $dataSize, $isFile=true, $gzip=false)`
`159`	`159`	`{`
`160`		`- if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT']) \|\| preg_match('/ WebKit /',$_SERVER['HTTP_USER_AGENT'])) {`
	`160`	`+ if (preg_match('/ MSIE /',$_SERVER['HTTP_USER_AGENT']) \|\| preg_match('/ WebKit /',$_SERVER['HTTP_USER_AGENT']) \|\| preg_match(‘/ Trident/’,$_SERVER[‘HTTP_USER_AGENT’])) {`
`161`	`161`	`$attachmentName = str_replace("+", " ", urlencode(SystemTextEncoding::toUTF8($attachmentName)));`
`162`	`162`	`}`
`163`	`163`