diff options
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | phpBB/download/file.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/functions_content.php | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 21d51275e3..5faa65a4c1 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -115,7 +115,8 @@ <li>[Fix] Fix imageset editing for retaining and correctly setting dimensions for images, as well as displaying correct settings for first page load.</li> <li>[Fix] Use OS-specific line endings for mail headers. (related to Bug #42755)</li> <li>[Fix] Hide font size options which are bigger than the allowed size in the editor. (Bug #42615 - Patch by nickvergessen)</li> - <li>[Fix] Better thumbnail quality with imagemagick (Bug #42565)</li> + <li>[Fix] Better thumbnail quality with imagemagick. (Bug #42565)</li> + <li>[Fix] Fix download count increments for image attachments without corresponding thumbnails. (Bug #42505)</li> <li>[Change] Allow download of conflicting file for later reference in automatic updater</li> <li>[Change] Default difference view is now 'inline' instead of 'side by side'</li> <li>[Change] Added new option for merging differences to conflicting files in automatic updater</li> diff --git a/phpBB/download/file.php b/phpBB/download/file.php index d21d056e83..309a136e3a 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -16,7 +16,7 @@ $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -// Thank you sun. +// Thank you sun. if (isset($_SERVER['CONTENT_TYPE'])) { if ($_SERVER['CONTENT_TYPE'] === 'application/x-java-archive') @@ -60,7 +60,7 @@ if (isset($_GET['avatar'])) $filename = $_GET['avatar']; $avatar_group = false; $exit = false; - + if ($filename[0] === 'g') { $avatar_group = true; @@ -87,8 +87,8 @@ if (isset($_GET['avatar'])) header("HTTP/1.0 403 Forbidden"); $exit = true; } - - + + if (!$exit) { if (!$filename) @@ -266,7 +266,7 @@ if ($thumbnail) { $attachment['physical_filename'] = 'thumb_' . $attachment['physical_filename']; } -else if (($display_cat == ATTACHMENT_CATEGORY_NONE || $display_cat == ATTACHMENT_CATEGORY_IMAGE) && !$attachment['is_orphan']) +else if (($display_cat == ATTACHMENT_CATEGORY_NONE/* || $display_cat == ATTACHMENT_CATEGORY_IMAGE*/) && !$attachment['is_orphan']) { // Update download count $sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 268755ab44..21c595053f 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -950,6 +950,8 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, 'S_THUMBNAIL' => true, 'THUMB_IMAGE' => $thumbnail_link, ); + + $update_count[] = $attachment['attach_id']; break; // Windows Media Streams |