From dd43af0ab66e14f152d7add4dbb5b07d68ec6150 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Fri, 10 Aug 2012 02:08:04 +0200 Subject: [PATCH] [feature/attach-dl] Make sure physical_filename is basenamed everywhere. PHPBB3-11042 --- phpBB/download/file.php | 4 ++-- 1 file 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'))