aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-05-17 13:23:13 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-05-17 13:23:13 +0000
commitfbd741606055ed75c0ff1bc2a110d880cad4cbd4 (patch)
tree99955b09aec69e65b73bf7592bf7e4dc4651638f /phpBB/includes/functions.php
parenta2c81d763fa2e591bf3aa8f48ffeed4beb363975 (diff)
downloadforums-fbd741606055ed75c0ff1bc2a110d880cad4cbd4.tar
forums-fbd741606055ed75c0ff1bc2a110d880cad4cbd4.tar.gz
forums-fbd741606055ed75c0ff1bc2a110d880cad4cbd4.tar.bz2
forums-fbd741606055ed75c0ff1bc2a110d880cad4cbd4.tar.xz
forums-fbd741606055ed75c0ff1bc2a110d880cad4cbd4.zip
#11074 - only process and check (as well as display) images if the category also matches. ;)
git-svn-id: file:///svn/phpbb/trunk@7616 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 922c85d06d..4f4ecb5117 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2987,7 +2987,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
$display_cat = ATTACHMENT_CATEGORY_NONE;
}
- $download_link = append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&amp;mode=view');
+ $download_link = append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id']);
switch ($display_cat)
{
@@ -2995,6 +2995,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
case ATTACHMENT_CATEGORY_IMAGE:
$l_downloaded_viewed = 'VIEWED_COUNT';
$inline_link = append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id']);
+ $download_link .= '&amp;mode=view';
$block_array += array(
'S_IMAGE' => true,
@@ -3008,6 +3009,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count,
case ATTACHMENT_CATEGORY_THUMB:
$l_downloaded_viewed = 'VIEWED_COUNT';
$thumbnail_link = append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&amp;t=1');
+ $download_link = '&amp;mode=view';
$block_array += array(
'S_THUMBNAIL' => true,