1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 00:07:44 +02:00

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
This commit is contained in:
Meik Sievertsen
2003-11-04 22:05:38 +00:00
parent 88f814a5c5
commit cd70db7976
17 changed files with 202 additions and 284 deletions

View File

@@ -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 = '';