diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-06-05 00:27:32 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-06-05 00:27:32 +0530 |
| commit | e6d521df298884ecb86e6cb2d35ef5570688b078 (patch) | |
| tree | be8ba5a6b5cd5e772563e18de153e097267d4937 /phpBB/download | |
| parent | d522dc5372cc8060245e5f81bcf759bf1bfc5c57 (diff) | |
| parent | 56e27a9908b759b9ec1aadb6f58a2f0f1b4f3ab3 (diff) | |
| download | forums-e6d521df298884ecb86e6cb2d35ef5570688b078.tar forums-e6d521df298884ecb86e6cb2d35ef5570688b078.tar.gz forums-e6d521df298884ecb86e6cb2d35ef5570688b078.tar.bz2 forums-e6d521df298884ecb86e6cb2d35ef5570688b078.tar.xz forums-e6d521df298884ecb86e6cb2d35ef5570688b078.zip | |
Merge branch 'ticket/10820' into ticket/10820-develop
* ticket/10820:
[ticket/10820] Inject IE version in function
Conflicts:
phpBB/download/file.php
Diffstat (limited to 'phpBB/download')
| -rw-r--r-- | phpBB/download/file.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 2675165cb9..3a28f282bd 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -279,7 +279,7 @@ else if ($download_id) phpbb_increment_downloads($db, $attachment['attach_id']); } - if ($display_cat == ATTACHMENT_CATEGORY_IMAGE && $mode === 'view' && (strpos($attachment['mimetype'], 'image') === 0) && !phpbb_is_greater_ie7($user->browser)) + if ($display_cat == ATTACHMENT_CATEGORY_IMAGE && $mode === 'view' && (strpos($attachment['mimetype'], 'image') === 0) && !phpbb_is_greater_ie_version($user->browser, 7)) { wrap_img_in_html(append_sid($phpbb_root_path . 'download/file.' . $phpEx, 'id=' . $attachment['attach_id']), $attachment['real_filename']); file_gc(); |