diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-03 16:38:25 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-03 16:38:25 +0000 |
| commit | 732ad23cd724e60df801a5cc32611e7d7706240d (patch) | |
| tree | 3a36d276173f9f784cd7bc96bb6e2fa4d2dccf81 /phpBB/includes/functions.php | |
| parent | 1ca8081635e10cc47b9e36a56e9f35565fd6c2db (diff) | |
| download | forums-732ad23cd724e60df801a5cc32611e7d7706240d.tar forums-732ad23cd724e60df801a5cc32611e7d7706240d.tar.gz forums-732ad23cd724e60df801a5cc32611e7d7706240d.tar.bz2 forums-732ad23cd724e60df801a5cc32611e7d7706240d.tar.xz forums-732ad23cd724e60df801a5cc32611e7d7706240d.zip | |
- removed download mode selection (the column info and constants will not be removed, we or others may be able to re-use them later on)
- removing extension from physical filename for uploaded attachments (as has been suggested some time ago from our community), can still be used by using the new 'unique_ext' mode on file cleaning
- fixed a bug with copying attachments if copying a topic
- made sure no attachment files get removed used at another location
- changed media player "embed" code. For some this may result in no auto-resizing - though a download link has been added.
git-svn-id: file:///svn/phpbb/trunk@6831 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5206e51fdd..a160bee7d3 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2463,7 +2463,6 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, global $extensions, $config, $phpbb_root_path, $phpEx; // - $force_physical = false; $compiled_attachments = array(); if (!isset($template->filename['attachment_tpl'])) @@ -2631,7 +2630,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, $display_cat = ATTACHMENT_CATEGORY_NONE; } - $download_link = (!$force_physical && $attachment['attach_id']) ? append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&f=' . (int) $forum_id) : $filename; + $download_link = append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&f=' . (int) $forum_id); switch ($display_cat) { @@ -2649,7 +2648,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, // Images, but display Thumbnail case ATTACHMENT_CATEGORY_THUMB: $l_downloaded_viewed = $user->lang['VIEWED']; - $thumbnail_link = (!$force_physical && $attachment['attach_id']) ? append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&t=1&f=' . (int) $forum_id) : $thumbnail_filename; + $thumbnail_link = append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&t=1&f=' . (int) $forum_id); $block_array += array( 'S_THUMBNAIL' => true, @@ -2663,10 +2662,11 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, // Giving the filename directly because within the wm object all variables are in local context making it impossible // to validate against a valid session (all params can differ) - $download_link = $filename; + // $download_link = $filename; $block_array += array( 'U_FORUM' => generate_board_url(), + 'ATTACH_ID' => $attachment['attach_id'], 'S_WM_FILE' => true, ); |