diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2016-06-11 13:45:48 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2016-06-11 13:45:48 +0200 |
| commit | cddf80c2e6bfc94465f06a5f6be4f26c1c6958fa (patch) | |
| tree | 37bf88003fbad4c0b18ac81d2496d860c08a5b47 | |
| parent | ef1e1631804e45f2ba1a68ed93f8dd6f1040468a (diff) | |
| parent | d316927225d6fba9764c65756316c60a8d87658f (diff) | |
| download | forums-cddf80c2e6bfc94465f06a5f6be4f26c1c6958fa.tar forums-cddf80c2e6bfc94465f06a5f6be4f26c1c6958fa.tar.gz forums-cddf80c2e6bfc94465f06a5f6be4f26c1c6958fa.tar.bz2 forums-cddf80c2e6bfc94465f06a5f6be4f26c1c6958fa.tar.xz forums-cddf80c2e6bfc94465f06a5f6be4f26c1c6958fa.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14291] Do not update filesize if displaying thumbnail
| -rw-r--r-- | phpBB/includes/functions_download.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index b295d4cd1e..1659d4b252 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 . ' |