diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-06-14 00:32:23 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-06-14 00:32:23 +0530 |
| commit | 4e8f1bf8945ffd1b3479f37c81018bcfb031a66b (patch) | |
| tree | 1c4afabb0bf41d5aae03a16b61af0049fc1e5c13 /phpBB/includes/functions_download.php | |
| parent | 86583754c310b67115df04386b633cdea9650732 (diff) | |
| parent | de150cb4ad4b26ab51bcf60bd4377870e6b3866b (diff) | |
| download | forums-4e8f1bf8945ffd1b3479f37c81018bcfb031a66b.tar forums-4e8f1bf8945ffd1b3479f37c81018bcfb031a66b.tar.gz forums-4e8f1bf8945ffd1b3479f37c81018bcfb031a66b.tar.bz2 forums-4e8f1bf8945ffd1b3479f37c81018bcfb031a66b.tar.xz forums-4e8f1bf8945ffd1b3479f37c81018bcfb031a66b.zip | |
Merge branch 'ticket/10820' into ticket/10820-develop
* ticket/10820:
[ticket/10820] fix if condition to check for IE
Conflicts:
phpBB/download/file.php
Diffstat (limited to 'phpBB/includes/functions_download.php')
| -rw-r--r-- | phpBB/includes/functions_download.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index cae3b80fc5..0a8000ea3d 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -188,7 +188,7 @@ function send_file_to_browser($attachment, $upload_dir, $category) } else { - if (empty($user->browser) || !phpbb_is_greater_ie_version($user->browser, 7)) + if (empty($user->browser) || ((strpos(strtolower($user->browser), 'msie') !== false) && !phpbb_is_greater_ie_version($user->browser, 7))) { header('Content-Disposition: attachment; ' . header_filename(htmlspecialchars_decode($attachment['real_filename']))); if (empty($user->browser) || (strpos(strtolower($user->browser), 'msie 6.0') !== false)) |