mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 23:25:30 +02:00
Code Issues Releases Wiki Activity

Fix download count increments for image attachments without corresponding thumbnails. (Bug #42505)

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9373 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-03-16 15:59:53 +00:00
parent d7b4e9e863
commit 3b918a234e
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/docs/CHANGELOG.html
View File

@ -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] 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] 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] 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] 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] 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> <li>[Change] Added new option for merging differences to conflicting files in automatic updater</li>

10
phpBB/download/file.php
View File

@ -16,7 +16,7 @@ $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1); $phpEx = substr(strrchr(__FILE__, '.'), 1);
// Thank you sun. // Thank you sun.
if (isset($_SERVER['CONTENT_TYPE'])) if (isset($_SERVER['CONTENT_TYPE']))
{ {
if ($_SERVER['CONTENT_TYPE'] === 'application/x-java-archive') if ($_SERVER['CONTENT_TYPE'] === 'application/x-java-archive')
@ -60,7 +60,7 @@ if (isset($_GET['avatar']))
$filename = $_GET['avatar']; $filename = $_GET['avatar'];
$avatar_group = false; $avatar_group = false;
$exit = false; $exit = false;
if ($filename[0] === 'g') if ($filename[0] === 'g')
{ {
$avatar_group = true; $avatar_group = true;
@ -87,8 +87,8 @@ if (isset($_GET['avatar']))
header("HTTP/1.0 403 Forbidden"); header("HTTP/1.0 403 Forbidden");
$exit = true; $exit = true;
} }
if (!$exit) if (!$exit)
{ {
if (!$filename) if (!$filename)
@ -266,7 +266,7 @@ if ($thumbnail)
{ {
$attachment['physical_filename'] = 'thumb_' . $attachment['physical_filename']; $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 // Update download count
$sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' $sql = 'UPDATE ' . ATTACHMENTS_TABLE . '

2
phpBB/includes/functions_content.php
View File

@ -950,6 +950,8 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
'S_THUMBNAIL' => true, 'S_THUMBNAIL' => true,
'THUMB_IMAGE' => $thumbnail_link, 'THUMB_IMAGE' => $thumbnail_link,
); );
$update_count[] = $attachment['attach_id'];
break; break;
// Windows Media Streams // Windows Media Streams