mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-11 05:48:51 +00:00
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/13125] $user->browser to $browser
This commit is contained in:
commit
c8a1826823
1 changed files with 1 additions and 1 deletions
|
@ -50,7 +50,7 @@ function send_avatar_to_browser($file, $browser)
|
||||||
$image_data = @getimagesize($file_path);
|
$image_data = @getimagesize($file_path);
|
||||||
header('Content-Type: ' . image_type_to_mime_type($image_data[2]));
|
header('Content-Type: ' . image_type_to_mime_type($image_data[2]));
|
||||||
|
|
||||||
if ((strpos(strtolower($user->browser), 'msie') !== false) && !phpbb_is_greater_ie_version($browser, 7))
|
if ((strpos(strtolower($browser), 'msie') !== false) && !phpbb_is_greater_ie_version($browser, 7))
|
||||||
{
|
{
|
||||||
header('Content-Disposition: attachment; ' . header_filename($file));
|
header('Content-Disposition: attachment; ' . header_filename($file));
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue