diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-09-23 10:43:33 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-09 10:18:40 +0200 |
| commit | 98ebbbdca2b7a57136745354b204d9aef181df4a (patch) | |
| tree | d6848504160f12e7762b472015c05fdfbce8459c /phpBB/includes/acp/acp_forums.php | |
| parent | 04786313892df25f5adce555ebae6b2e5ad4d222 (diff) | |
| download | forums-98ebbbdca2b7a57136745354b204d9aef181df4a.tar forums-98ebbbdca2b7a57136745354b204d9aef181df4a.tar.gz forums-98ebbbdca2b7a57136745354b204d9aef181df4a.tar.bz2 forums-98ebbbdca2b7a57136745354b204d9aef181df4a.tar.xz forums-98ebbbdca2b7a57136745354b204d9aef181df4a.zip | |
[ticket/14168] No longer use deprecated functions in core files
PHPBB3-14168
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index f252f2a594..905a885a56 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -1788,7 +1788,7 @@ class acp_forums */ function delete_forum_content($forum_id) { - global $db, $config, $phpbb_root_path, $phpEx, $phpbb_dispatcher; + global $db, $config, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher; include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); @@ -1809,7 +1809,10 @@ class acp_forums } $db->sql_freeresult($result); - delete_attachments('topic', $topic_ids, false); + /** @var \phpbb\attachment\delete $attachment_delete */ + $attachment_delete = $phpbb_container->get('attachment.delete'); + $attachment_delete->delete('topic', $topic_ids, false); + unset($attachment_delete); // Delete shadow topics pointing to topics in this forum delete_topic_shadows($forum_id); |