diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-08-20 00:47:21 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-08-20 00:47:21 +0200 |
| commit | 7893e992ff516eb3eb7355e591a077053e47fb12 (patch) | |
| tree | 0c96a6484ba35fa8ef07c8e26152ca3a6b7208e0 /phpBB | |
| parent | 8c69db6ab28496e968ba172ac4e63addc62cbde8 (diff) | |
| parent | ba9d303d525e3b8a12748da02080e3cbc6644a3b (diff) | |
| download | forums-7893e992ff516eb3eb7355e591a077053e47fb12.tar forums-7893e992ff516eb3eb7355e591a077053e47fb12.tar.gz forums-7893e992ff516eb3eb7355e591a077053e47fb12.tar.bz2 forums-7893e992ff516eb3eb7355e591a077053e47fb12.tar.xz forums-7893e992ff516eb3eb7355e591a077053e47fb12.zip | |
Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
[ticket/11802] replace $browser with $user->browser
Diffstat (limited to 'phpBB')
| -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 22be27c922..ed33fc0962 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -285,7 +285,7 @@ else if (($display_cat == ATTACHMENT_CATEGORY_NONE/* || $display_cat == ATTACHME $db->sql_query($sql); } -if ($display_cat == ATTACHMENT_CATEGORY_IMAGE && $mode === 'view' && (strpos($attachment['mimetype'], 'image') === 0) && (strpos(strtolower($browser), 'msie') !== false) && !phpbb_is_greater_ie_version($user->browser, 7)) +if ($display_cat == ATTACHMENT_CATEGORY_IMAGE && $mode === 'view' && (strpos($attachment['mimetype'], 'image') === 0) && (strpos(strtolower($user->browser), 'msie') !== false) && !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(); |