diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-10-12 11:34:11 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-10-12 11:34:11 +0200 |
| commit | 49312f05f88ca58346cbb00c2f03f01fd2a3d56d (patch) | |
| tree | 1db2077dc34caf17f580771bf8967403b6a69660 /phpBB/includes/acp | |
| parent | a0167ad41037d7fe9214ca36c4c7097177361a6b (diff) | |
| download | forums-49312f05f88ca58346cbb00c2f03f01fd2a3d56d.tar forums-49312f05f88ca58346cbb00c2f03f01fd2a3d56d.tar.gz forums-49312f05f88ca58346cbb00c2f03f01fd2a3d56d.tar.bz2 forums-49312f05f88ca58346cbb00c2f03f01fd2a3d56d.tar.xz forums-49312f05f88ca58346cbb00c2f03f01fd2a3d56d.zip | |
[ticket/14168] Use attachment manager instead of separate classes
PHPBB3-14168
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_attachments.php | 12 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 16 |
3 files changed, 18 insertions, 18 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 49b8ea462c..e2090f3cd5 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -39,8 +39,8 @@ class acp_attachments /** @var \phpbb\filesystem\filesystem_interface */ protected $filesystem; - /** @var \phpbb\attachment\delete */ - protected $attachment_delete; + /** @var \phpbb\attachment\manager */ + protected $attachment_manager; public $id; public $u_action; @@ -58,7 +58,7 @@ class acp_attachments $this->user = $user; $this->phpbb_container = $phpbb_container; $this->filesystem = $phpbb_filesystem; - $this->attachment_delete = $phpbb_container->get('attachment.delete'); + $this->attachment_manager = $phpbb_container->get('attachment.manager'); $user->add_lang(array('posting', 'viewtopic', 'acp/attachments')); @@ -926,11 +926,11 @@ class acp_attachments $delete_files = array(); while ($row = $db->sql_fetchrow($result)) { - $this->attachment_delete->unlink_attachment($row['physical_filename'], 'file'); + $this->attachment_manager->unlink($row['physical_filename'], 'file'); if ($row['thumbnail']) { - $this->attachment_delete->unlink_attachment($row['physical_filename'], 'thumbnail'); + $this->attachment_manager->unlink($row['physical_filename'], 'thumbnail'); } $delete_files[$row['attach_id']] = $row['real_filename']; @@ -1095,7 +1095,7 @@ class acp_attachments } $db->sql_freeresult($result); - if ($num_deleted = $this->attachment_delete->delete('attach', $delete_files)) + if ($num_deleted = $this->attachment_manager->delete('attach', $delete_files)) { if (sizeof($delete_files) != $num_deleted) { diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 905a885a56..5d20664b31 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -1809,10 +1809,10 @@ class acp_forums } $db->sql_freeresult($result); - /** @var \phpbb\attachment\delete $attachment_delete */ - $attachment_delete = $phpbb_container->get('attachment.delete'); - $attachment_delete->delete('topic', $topic_ids, false); - unset($attachment_delete); + /** @var \phpbb\attachment\manager $attachment_manager */ + $attachment_manager = $phpbb_container->get('attachment.manager'); + $attachment_manager->delete('topic', $topic_ids, false); + unset($attachment_manager); // Delete shadow topics pointing to topics in this forum delete_topic_shadows($forum_id); diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index ab0eda507e..f26c0d3f93 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -543,10 +543,10 @@ class acp_users if (confirm_box(true)) { - /** @var \phpbb\attachment\delete $attachment_delete */ - $attachment_delete = $phpbb_container->get('attachment.delete'); - $attachment_delete->delete('user', $user_id); - unset($attachment_delete); + /** @var \phpbb\attachment\manager $attachment_manager */ + $attachment_manager = $phpbb_container->get('attachment.manager'); + $attachment_manager->delete('user', $user_id); + unset($attachment_manager); $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_USER_DEL_ATTACH', false, array($user_row['username'])); trigger_error($user->lang['USER_ATTACHMENTS_REMOVED'] . adm_back_link($this->u_action . '&u=' . $user_id)); @@ -2129,10 +2129,10 @@ class acp_users } $db->sql_freeresult($result); - /** @var \phpbb\attachment\delete $attachment_delete */ - $attachment_delete = $phpbb_container->get('attachment.delete'); - $attachment_delete->delete('attach', $marked); - unset($attachment_delete); + /** @var \phpbb\attachment\manager $attachment_manager */ + $attachment_manager = $phpbb_container->get('attachment.manager'); + $attachment_manager->delete('attach', $marked); + unset($attachment_manager); $message = (sizeof($log_attachments) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']; |