1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-04 16:06:00 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2020-02-11 17:05:39 +01:00
commit 495428f2ad
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

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