aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_display.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2003-11-04 22:05:38 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2003-11-04 22:05:38 +0000
commitcd70db7976f43d01cd3cd41467c09f85298d447b (patch)
tree6f583aba6f9176a1e732652f10a928f0ae004c6c /phpBB/includes/functions_display.php
parent88f814a5c57246250a82ad53d43f8f90da5afb60 (diff)
downloadforums-cd70db7976f43d01cd3cd41467c09f85298d447b.tar
forums-cd70db7976f43d01cd3cd41467c09f85298d447b.tar.gz
forums-cd70db7976f43d01cd3cd41467c09f85298d447b.tar.bz2
forums-cd70db7976f43d01cd3cd41467c09f85298d447b.tar.xz
forums-cd70db7976f43d01cd3cd41467c09f85298d447b.zip
new permissions, merged attachment tables (the intended purpose of two tables is no longer valid), attachment updates along the merging...
Note: please merge your attachment tables (develop dir). git-svn-id: file:///svn/phpbb/trunk@4637 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
-rw-r--r--phpBB/includes/functions_display.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 17ba765b8f..d96f2cb9c9 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -292,6 +292,8 @@ function display_attachments($attachment_data, &$update_count, $force_physical =
global $extensions, $template;
global $config, $user, $phpbb_root_path, $phpEx, $SID, $censors;
+ $upload_dir = ($config['upload_dir'][0] == '/' || ($config['upload_dir'][0] != '/' && $config['upload_dir'][1] == ':')) ? $config['upload_dir'] : $phpbb_root_path . $config['upload_dir'];
+
if (empty($censors))
{
$censors = array();
@@ -304,14 +306,12 @@ function display_attachments($attachment_data, &$update_count, $force_physical =
obtain_attach_extensions($extensions);
}
- $update_count = array();
-
foreach ($attachment_data as $attachment)
{
// Some basics...
$attachment['extension'] = strtolower(trim($attachment['extension']));
- $filename = $config['upload_dir'] . '/' . $attachment['physical_filename'];
- $thumbnail_filename = $config['upload_dir'] . '/thumbs/t_' . $attachment['physical_filename'];
+ $filename = $upload_dir . '/' . $attachment['physical_filename'];
+ $thumbnail_filename = $upload_dir . '/thumbs/t_' . $attachment['physical_filename'];
$upload_image = '';