mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/14168] No longer use deprecated functions in core files

Browse Source 
PHPBB3-14168
This commit is contained in:
Marc Alexander
2015-09-23 10:43:33 +02:00
parent 0478631389
commit 98ebbbdca2
7 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/includes/functions_privmsgs.php
View File

@@ -1153,12 +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
if (!function_exists('delete_attachments'))
{
include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
}
delete_attachments('message', $delete_ids, false);
/** @var \phpbb\attachment\delete $attachment_delete */
$attachment_delete = $phpbb_container->get('attachment.delete');
$attachment_delete->delete('message', $delete_ids, false);
unset($attachment_delete);
$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
WHERE ' . $db->sql_in_set('msg_id', $delete_ids);
@@ -1363,12 +1361,10 @@ function phpbb_delete_users_pms($user_ids)
if (!empty($delete_ids))
{
// Check if there are any attachments we need to remove
if (!function_exists('delete_attachments'))
{
include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
}
delete_attachments('message', $delete_ids, false);
/** @var \phpbb\attachment\delete $attachment_delete */
$attachment_delete = $phpbb_container->get('attachment.delete');
$attachment_delete->delete('message', $delete_ids, false);
unset($attachment_delete);
$sql = 'DELETE FROM ' . PRIVMSGS_TABLE . '
WHERE ' . $db->sql_in_set('msg_id', $delete_ids);