diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-20 20:29:05 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-20 20:29:05 +0100 |
| commit | c24a84004823aa35029e415a7f435bfdfc1fc5c8 (patch) | |
| tree | c41fa73f901981142341ea742b36de483fc789f3 /phpBB/includes | |
| parent | 8a06f21ea9cf81d6606501b38b3deac7b202c6b0 (diff) | |
| parent | ff59240748cab78362b91591880a1c72f2515e4d (diff) | |
| download | forums-c24a84004823aa35029e415a7f435bfdfc1fc5c8.tar forums-c24a84004823aa35029e415a7f435bfdfc1fc5c8.tar.gz forums-c24a84004823aa35029e415a7f435bfdfc1fc5c8.tar.bz2 forums-c24a84004823aa35029e415a7f435bfdfc1fc5c8.tar.xz forums-c24a84004823aa35029e415a7f435bfdfc1fc5c8.zip | |
Merge pull request #3277 from dhruvgoel92/ticket/13472
[ticket/13472] Delete admin activation notification when deleting user
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_user.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index acf5649ed5..9cd662027e 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'); /** |