diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-08-10 02:08:04 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-08-10 02:08:04 +0200 |
| commit | dd43af0ab66e14f152d7add4dbb5b07d68ec6150 (patch) | |
| tree | 7f85333d11e47887c586043b0d7f65efdf29b3a4 /phpBB/download | |
| parent | c221294fb21e19f483972a4672636dc355b34888 (diff) | |
| download | forums-dd43af0ab66e14f152d7add4dbb5b07d68ec6150.tar forums-dd43af0ab66e14f152d7add4dbb5b07d68ec6150.tar.gz forums-dd43af0ab66e14f152d7add4dbb5b07d68ec6150.tar.bz2 forums-dd43af0ab66e14f152d7add4dbb5b07d68ec6150.tar.xz forums-dd43af0ab66e14f152d7add4dbb5b07d68ec6150.zip | |
[feature/attach-dl] Make sure physical_filename is basenamed everywhere.
PHPBB3-11042
Diffstat (limited to 'phpBB/download')
| -rw-r--r-- | phpBB/download/file.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 5bb7770bdf..35c940dd61 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -182,6 +182,8 @@ while ($row = $db->sql_fetchrow($result)) { $attachment_id = (int) $row['attach_id']; + $row['physical_filename'] = utf8_basename($row['physical_filename']); + $attachment_ids[$attachment_id] = $attachment_id; $attachments[$attachment_id] = $row; } @@ -293,8 +295,6 @@ else if ($download_id) } $download_mode = (int) $extensions[$attachment['extension']]['download_mode']; - - $attachment['physical_filename'] = utf8_basename($attachment['physical_filename']); $display_cat = $extensions[$attachment['extension']]['display_cat']; if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !$user->optionget('viewimg')) |