aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorDhruv <dhruv.goel92@gmail.com>2015-01-11 14:09:59 +0530
committerDhruv <dhruv.goel92@gmail.com>2015-01-11 14:09:59 +0530
commitff59240748cab78362b91591880a1c72f2515e4d (patch)
tree2c1508f5a7269e0df800c7b3a96b75f8b7589bc0 /phpBB/includes/functions_user.php
parenta415a4ec2b732d4bb88ab4da8f4709fe748592f6 (diff)
downloadforums-ff59240748cab78362b91591880a1c72f2515e4d.tar
forums-ff59240748cab78362b91591880a1c72f2515e4d.tar.gz
forums-ff59240748cab78362b91591880a1c72f2515e4d.tar.bz2
forums-ff59240748cab78362b91591880a1c72f2515e4d.tar.xz
forums-ff59240748cab78362b91591880a1c72f2515e4d.zip
[ticket/13472] Delete admin activation notification when deleting user
PHPBB3-13472
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index f79a8998c4..428b648873 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -398,7 +398,7 @@ function user_add($user_row, $cp_data = false, $notifications_data = null)
*/
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;
$db->sql_transaction('begin');
@@ -672,6 +672,9 @@ function user_delete($mode, $user_ids, $retain_username = true)
}
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');
/**