makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/attach-dl] Make sure physical_filename is basenamed everywhere.

Browse source 
PHPBB3-11042
This commit is contained in:
Andreas Fischer 2012-08-10 02:08:04 +02:00
parent c221294fb2
commit dd43af0ab6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/download/file.php
View file

@ -182,6 +182,8 @@ while ($row = $db->sql_fetchrow($result))
{ {
$attachment_id = (int) $row['attach_id']; $attachment_id = (int) $row['attach_id'];
$row['physical_filename'] = utf8_basename($row['physical_filename']);
$attachment_ids[$attachment_id] = $attachment_id; $attachment_ids[$attachment_id] = $attachment_id;
$attachments[$attachment_id] = $row; $attachments[$attachment_id] = $row;
} }
@ -293,8 +295,6 @@ else if ($download_id)
} }
$download_mode = (int) $extensions[$attachment['extension']]['download_mode']; $download_mode = (int) $extensions[$attachment['extension']]['download_mode'];
$attachment['physical_filename'] = utf8_basename($attachment['physical_filename']);
$display_cat = $extensions[$attachment['extension']]['display_cat']; $display_cat = $extensions[$attachment['extension']]['display_cat'];
if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !$user->optionget('viewimg')) if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !$user->optionget('viewimg'))