mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 20:38:52 +00:00
Merge branch '3.3.x'
This commit is contained in:
commit
495428f2ad
1 changed files with 3 additions and 1 deletions
|
@ -1169,6 +1169,8 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a
|
||||||
$filename = utf8_basename($attachment['physical_filename']);
|
$filename = utf8_basename($attachment['physical_filename']);
|
||||||
|
|
||||||
$upload_icon = '';
|
$upload_icon = '';
|
||||||
|
$download_link = '';
|
||||||
|
$display_cat = false;
|
||||||
|
|
||||||
if (isset($extensions[$attachment['extension']]))
|
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)));
|
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);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue