mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

[ticket/14168] Use attachment manager instead of separate classes

Browse Source 
PHPBB3-14168
This commit is contained in:
Marc Alexander
2015-10-12 11:34:11 +02:00
parent a0167ad410
commit 49312f05f8
12 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/includes/functions_privmsgs.php
View File

@@ -1153,10 +1153,10 @@ function delete_pm($user_id, $msg_ids, $folder_id)
if (sizeof($delete_ids))
{
// Check if there are any attachments we need to remove
/** @var \phpbb\attachment\delete $attachment_delete */
$attachment_delete = $phpbb_container->get('attachment.delete');
$attachment_delete->delete('message', $delete_ids, false);
unset($attachment_delete);
/** @var \phpbb\attachment\manager $attachment_manager */
$attachment_manager = $phpbb_container->get('attachment.manager');
$attachment_manager->delete('message', $delete_ids, false);
unset($attachment_manager);
$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
@@ -1361,10 +1361,10 @@ function phpbb_delete_users_pms($user_ids)
if (!empty($delete_ids))
{
// Check if there are any attachments we need to remove
/** @var \phpbb\attachment\delete $attachment_delete */
$attachment_delete = $phpbb_container->get('attachment.delete');
$attachment_delete->delete('message', $delete_ids, false);
unset($attachment_delete);
/** @var \phpbb\attachment\manager $attachment_manager */
$attachment_manager = $phpbb_container->get('attachment.manager');
$attachment_manager->delete('message', $delete_ids, false);
unset($attachment_manager);
$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
WHERE ' . $db->sql_in_set('msg_id', $delete_ids);