aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_download.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-10-04 00:41:25 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-10-04 00:41:25 +0200
commitc8a1826823601ac1a9f59ec5a6e3ae63c5c0fe9c (patch)
treeeec7225c2e17f801e19ac8a81c51e968022cc2b7 /phpBB/includes/functions_download.php
parent6cb5e6c3b47e57ff81a80bf08db2a469b6e26020 (diff)
parent682527f509325f09bc0f6d56adf8cd06598a149c (diff)
downloadforums-c8a1826823601ac1a9f59ec5a6e3ae63c5c0fe9c.tar
forums-c8a1826823601ac1a9f59ec5a6e3ae63c5c0fe9c.tar.gz
forums-c8a1826823601ac1a9f59ec5a6e3ae63c5c0fe9c.tar.bz2
forums-c8a1826823601ac1a9f59ec5a6e3ae63c5c0fe9c.tar.xz
forums-c8a1826823601ac1a9f59ec5a6e3ae63c5c0fe9c.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/13125] $user->browser to $browser
Diffstat (limited to 'phpBB/includes/functions_download.php')
-rw-r--r--phpBB/includes/functions_download.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php
index 704939b176..fbeae50f55 100644
--- a/phpBB/includes/functions_download.php
+++ b/phpBB/includes/functions_download.php
@@ -50,7 +50,7 @@ function send_avatar_to_browser($file, $browser)
$image_data = @getimagesize($file_path);
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));