mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-24 02:21:43 +02:00
Merge branch '3.1.x'
This commit is contained in:
@@ -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');
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user