aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_display.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2003-11-16 21:53:56 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2003-11-16 21:53:56 +0000
commit306d36f03dadde4ed99410ea907ec82cef1848b6 (patch)
tree3828d33092e95fcfd30659997a65ffc5e5e01e04 /phpBB/includes/functions_display.php
parente80f40d5bb754aaa720c9e240e6310bff76cea70 (diff)
downloadforums-306d36f03dadde4ed99410ea907ec82cef1848b6.tar
forums-306d36f03dadde4ed99410ea907ec82cef1848b6.tar.gz
forums-306d36f03dadde4ed99410ea907ec82cef1848b6.tar.bz2
forums-306d36f03dadde4ed99410ea907ec82cef1848b6.tar.xz
forums-306d36f03dadde4ed99410ea907ec82cef1848b6.zip
Finished drafts, one bit is remaining though.
added file and disk space statistics. some minor changes here and there. git-svn-id: file:///svn/phpbb/trunk@4668 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
-rw-r--r--phpBB/includes/functions_display.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index e1308311c4..a8a0a80244 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -295,7 +295,6 @@ function display_attachments($blockname, $attachment_data, &$update_count, $forc
// $starttime = explode(' ', microtime());
// $starttime = $starttime[1] + $starttime[0];
- $upload_dir = ($config['upload_dir'][0] == '/' || ($config['upload_dir'][0] != '/' && $config['upload_dir'][1] == ':')) ? $config['upload_dir'] : $phpbb_root_path . $config['upload_dir'];
$blocks = array(WM_CAT => 'WM_STREAM', RM_CAT => 'RM_STREAM', THUMB_CAT => 'THUMBNAIL', IMAGE_CAT => 'IMAGE');
if (!isset($attachment_tpl))
@@ -349,8 +348,8 @@ function display_attachments($blockname, $attachment_data, &$update_count, $forc
{
// Some basics...
$attachment['extension'] = strtolower(trim($attachment['extension']));
- $filename = $upload_dir . '/' . $attachment['physical_filename'];
- $thumbnail_filename = $upload_dir . '/thumbs/t_' . $attachment['physical_filename'];
+ $filename = $config['upload_dir'] . '/' . $attachment['physical_filename'];
+ $thumbnail_filename = $config['upload_dir'] . '/thumb_' . $attachment['physical_filename'];
$upload_image = '';