mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-08 01:44:07 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander 2020-03-01 17:11:18 +01:00
commit a7bc774a53
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/ucp/ucp_pm_compose.php
View File

@ -689,6 +689,10 @@ function compose_pm($id, $mode, $action, $user_folders = array())
);
$db->sql_query($sql);
/** @var \phpbb\attachment\manager $attachment_manager */
$attachment_manager = $phpbb_container->get('attachment.manager');
$attachment_manager->delete('attach', array_column($message_parser->attachment_data, 'attach_id'));
$redirect_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=pm&mode=$mode");
meta_refresh(3, $redirect_url);

4
phpBB/posting.php
View File

@ -759,6 +759,10 @@ if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && (
);
$db->sql_query($sql);
/** @var \phpbb\attachment\manager $attachment_manager */
$attachment_manager = $phpbb_container->get('attachment.manager');
$attachment_manager->delete('attach', array_column($message_parser->attachment_data, 'attach_id'));
$meta_info = ($mode == 'post') ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) : append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id");
meta_refresh(3, $meta_info);