[ticket/13472] Delete admin activation notification when deleting user

PHPBB3-13472
This commit is contained in:
Dhruv 2015-01-11 14:09:59 +05:30
parent a415a4ec2b
commit ff59240748

View file

@ -398,7 +398,7 @@ function user_add($user_row, $cp_data = false, $notifications_data = null)
*/ */
function user_delete($mode, $user_ids, $retain_username = true) function user_delete($mode, $user_ids, $retain_username = true)
{ {
global $cache, $config, $db, $user, $phpbb_dispatcher; global $cache, $config, $db, $user, $phpbb_dispatcher, $phpbb_container;
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
$db->sql_transaction('begin'); $db->sql_transaction('begin');
@ -672,6 +672,9 @@ function user_delete($mode, $user_ids, $retain_username = true)
} }
phpbb_delete_users_pms($user_ids); phpbb_delete_users_pms($user_ids);
$phpbb_notifications = $phpbb_container->get('notification_manager');
$phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_ids);
$db->sql_transaction('commit'); $db->sql_transaction('commit');
/** /**