Merge branch 'ticket/10820' into ticket/10820-develop

* ticket/10820:
  [ticket/10820] fix if condition to check for IE

Conflicts:
	phpBB/download/file.php
This commit is contained in:
Dhruv 2013-06-14 00:32:23 +05:30
commit 4e8f1bf894

View file

@ -188,7 +188,7 @@ function send_file_to_browser($attachment, $upload_dir, $category)
} }
else else
{ {
if (empty($user->browser) || !phpbb_is_greater_ie_version($user->browser, 7)) if (empty($user->browser) || ((strpos(strtolower($user->browser), 'msie') !== false) && !phpbb_is_greater_ie_version($user->browser, 7)))
{ {
header('Content-Disposition: attachment; ' . header_filename(htmlspecialchars_decode($attachment['real_filename']))); header('Content-Disposition: attachment; ' . header_filename(htmlspecialchars_decode($attachment['real_filename'])));
if (empty($user->browser) || (strpos(strtolower($user->browser), 'msie 6.0') !== false)) if (empty($user->browser) || (strpos(strtolower($user->browser), 'msie 6.0') !== false))