diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-02-20 20:29:45 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-02-20 20:29:45 +0100 |
| commit | 0dab7e255233c99aba68da8b60ebfbbdcfd20ea9 (patch) | |
| tree | b5693a5e6b440a6ce0a5db5a6d6e95fd7f657054 /phpBB/includes/functions_user.php | |
| parent | a1ecb10c5cc9a2bb4b7bab31cb11c958fd13986a (diff) | |
| parent | c24a84004823aa35029e415a7f435bfdfc1fc5c8 (diff) | |
| download | forums-0dab7e255233c99aba68da8b60ebfbbdcfd20ea9.tar forums-0dab7e255233c99aba68da8b60ebfbbdcfd20ea9.tar.gz forums-0dab7e255233c99aba68da8b60ebfbbdcfd20ea9.tar.bz2 forums-0dab7e255233c99aba68da8b60ebfbbdcfd20ea9.tar.xz forums-0dab7e255233c99aba68da8b60ebfbbdcfd20ea9.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -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 08dc47f8b3..c7234bb8e8 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -400,7 +400,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'); @@ -674,6 +674,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'); /** |