diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-04-30 10:46:17 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-04-30 10:46:17 +0000 |
| commit | 42251d008c06ad0f475f116643c6583fc9a4eda7 (patch) | |
| tree | 0380ef1d4f7224c96612a8951988a59f33c6074e /phpBB/includes/functions.php | |
| parent | dc747b8d994b6f5d07182196ed9deed7959a7317 (diff) | |
| download | forums-42251d008c06ad0f475f116643c6583fc9a4eda7.tar forums-42251d008c06ad0f475f116643c6583fc9a4eda7.tar.gz forums-42251d008c06ad0f475f116643c6583fc9a4eda7.tar.bz2 forums-42251d008c06ad0f475f116643c6583fc9a4eda7.tar.xz forums-42251d008c06ad0f475f116643c6583fc9a4eda7.zip | |
Prepare to be yelled at and brace for the tide of bug reports: I had hoped we would not have to do this, but it seems that we have to.
-Route all avatar downloads through download.php - adrien
-Change the way inline attachments are delivered
-Fixes a few (unreported) bugs, notably avatar upload during group generation
-#10079
git-svn-id: file:///svn/phpbb/trunk@7429 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 391968680a..0592401756 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2878,16 +2878,18 @@ 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'] . '&f=' . (int) $forum_id); + $download_link = append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&f=' . (int) $forum_id . '&mode=view'); switch ($display_cat) { // Images case ATTACHMENT_CATEGORY_IMAGE: $l_downloaded_viewed = 'VIEWED_COUNT'; + $inline_link = append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&f=' . (int) $forum_id); $block_array += array( 'S_IMAGE' => true, + 'U_INLINE_LINK' => $inline_link, ); $update_count[] = $attachment['attach_id']; |