From 98ebbbdca2b7a57136745354b204d9aef181df4a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 23 Sep 2015 10:43:33 +0200
Subject: [ticket/14168] No longer use deprecated functions in core files

PHPBB3-14168
---
 phpBB/includes/ucp/ucp_attachments.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'phpBB/includes/ucp')

diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php
index 639f308091..64cad1aa90 100644
--- a/phpBB/includes/ucp/ucp_attachments.php
+++ b/phpBB/includes/ucp/ucp_attachments.php
@@ -70,12 +70,10 @@ class ucp_attachments
 
 			if (confirm_box(true))
 			{
-				if (!function_exists('delete_attachments'))
-				{
-					include_once($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
-				}
-
-				delete_attachments('attach', $delete_ids);
+				/** @var \phpbb\attachment\delete $attachment_delete */
+				$attachment_delete = $phpbb_container->get('attachment.delete');
+				$attachment_delete->delete('attach', $delete_ids);
+				unset($attachment_delete);
 
 				meta_refresh(3, $this->u_action);
 				$message = ((sizeof($delete_ids) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']) . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-- 
cgit v1.2.1


From 49312f05f88ca58346cbb00c2f03f01fd2a3d56d Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 12 Oct 2015 11:34:11 +0200
Subject: [ticket/14168] Use attachment manager instead of separate classes

PHPBB3-14168
---
 phpBB/includes/ucp/ucp_attachments.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/includes/ucp')

diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php
index 64cad1aa90..b8cb3c4100 100644
--- a/phpBB/includes/ucp/ucp_attachments.php
+++ b/phpBB/includes/ucp/ucp_attachments.php
@@ -70,10 +70,10 @@ class ucp_attachments
 
 			if (confirm_box(true))
 			{
-				/** @var \phpbb\attachment\delete $attachment_delete */
-				$attachment_delete = $phpbb_container->get('attachment.delete');
-				$attachment_delete->delete('attach', $delete_ids);
-				unset($attachment_delete);
+				/** @var \phpbb\attachment\manager $attachment_manager */
+				$attachment_manager = $phpbb_container->get('attachment.manager');
+				$attachment_manager->delete('attach', $delete_ids);
+				unset($attachment_manager);
 
 				meta_refresh(3, $this->u_action);
 				$message = ((sizeof($delete_ids) == 1) ? $user->lang['ATTACHMENT_DELETED'] : $user->lang['ATTACHMENTS_DELETED']) . '<br /><br />' . sprintf($user->lang['RETURN_UCP'], '<a href="' . $this->u_action . '">', '</a>');
-- 
cgit v1.2.1