diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-04-27 22:01:13 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-04-27 23:04:46 +0200 |
| commit | cba5dde0ee0a2f4c2197959f45c5b53389798837 (patch) | |
| tree | 76cc6f9042da1fd1abd208d35afd6b0de129e229 /phpBB/download/file.php | |
| parent | c182ab0e7b2739ff70fb18611af5e1baa02d81a2 (diff) | |
| parent | b39e6e01b291f7a20a143ae3aea1a9582b0c4cad (diff) | |
| download | forums-cba5dde0ee0a2f4c2197959f45c5b53389798837.tar forums-cba5dde0ee0a2f4c2197959f45c5b53389798837.tar.gz forums-cba5dde0ee0a2f4c2197959f45c5b53389798837.tar.bz2 forums-cba5dde0ee0a2f4c2197959f45c5b53389798837.tar.xz forums-cba5dde0ee0a2f4c2197959f45c5b53389798837.zip | |
Merge remote-tracking branch 'dhruvgoel92/ticket/10820' into ticket/10820-develop
* dhruvgoel92/ticket/10820:
[ticket/10820] remove unnecessary parentheses
[ticket/10820] fix docblock
[ticket/10820] add param and return to function
[ticket/10820] simplify regex and escape dot
[ticket/10820] Use singular return
[ticket/10820] remove unnecessary condition checks
[ticket/10820] add function docblock
[ticket/10820] fix IE check function
[ticket/10820] proper usage of global and local variable browser
[ticket/10820] Image downloader recognize new version of ie
Conflicts:
phpBB/download/file.php
Diffstat (limited to 'phpBB/download/file.php')
| -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 eee2090da0..2675165cb9 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) && ((strpos(strtolower($user->browser), 'msie') !== false) && (strpos(strtolower($user->browser), 'msie 8.0') === false))) + if ($display_cat == ATTACHMENT_CATEGORY_IMAGE && $mode === 'view' && (strpos($attachment['mimetype'], 'image') === 0) && !phpbb_is_greater_ie7($user->browser)) { wrap_img_in_html(append_sid($phpbb_root_path . 'download/file.' . $phpEx, 'id=' . $attachment['attach_id']), $attachment['real_filename']); file_gc(); |