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

Merge branch '3.2.x' into 3.3.x

Browse source
This commit is contained in:
Marc Alexander 2020-02-11 17:05:34 +01:00
commit b1eaaea89a
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions_content.php
View file

@ -1166,6 +1166,8 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a
$filename = $phpbb_root_path . $config['upload_path'] . '/' . utf8_basename($attachment['physical_filename']); $filename = $phpbb_root_path . $config['upload_path'] . '/' . utf8_basename($attachment['physical_filename']);
$upload_icon = ''; $upload_icon = '';
$download_link = '';
$display_cat = false;
if (isset($extensions[$attachment['extension']])) if (isset($extensions[$attachment['extension']]))
{ {
@ -1325,7 +1327,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a
); );
extract($phpbb_dispatcher->trigger_event('core.parse_attachments_modify_template_data', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.parse_attachments_modify_template_data', compact($vars)));
$update_count_ary = $update_count; $update_count_ary = $update_count;
unset($update_count); unset($update_count, $display_cat, $download_link);
$template->assign_block_vars('_file', $block_array); $template->assign_block_vars('_file', $block_array);