aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_download.php
diff options
context:
space:
mode:
authorWesley Fok <wesley.fok@yp.ca>2016-08-03 13:20:42 -0400
committerWesley Fok <wesley.fok@yp.ca>2016-08-03 13:20:42 -0400
commitba13832085bf05eb5ab19aeb9681b16c7a119df9 (patch)
tree7fb014aeb08e614fe060dfeede0ea05885ff4d7d /phpBB/includes/functions_download.php
parent2081a7809540db661193be376c1220a2c21acff4 (diff)
parentf68820762b2d78bc26c59724a3dd98091bb3379b (diff)
downloadforums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar
forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar.gz
forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar.bz2
forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar.xz
forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.zip
Merge remote-tracking branch 'upstream/3.1.x' into ticket/14638-3.1.x
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 2c5cba2c0d..2c6f62227c 100644
--- a/phpBB/includes/functions_download.php
+++ b/phpBB/includes/functions_download.php
@@ -166,7 +166,7 @@ function send_file_to_browser($attachment, $upload_dir, $category)
}
// Make sure the database record for the filesize is correct
- if ($size > 0 && $size != $attachment['filesize'])
+ if ($size > 0 && $size != $attachment['filesize'] && strpos($attachment['physical_filename'], 'thumb_') === false)
{
// Update database record
$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '