makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source
This commit is contained in:
Joas Schilling 2015-02-20 20:29:45 +01:00
commit 0dab7e2552
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/functions_user.php
View file

@ -400,7 +400,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');
@ -674,6 +674,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');
/** /**