mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/10729' into ticket/10729-asc

Browse Source 
Conflicts:
	phpBB/includes/functions_user.php
This commit is contained in:
Joas Schilling
2014-09-23 09:17:38 +02:00
parent bef207e9b7 bea5f94de6
commit 9ff6358dc9
4 changed files with 982 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/functions_user.php
View File

@@ -363,12 +363,16 @@ function user_add($user_row, $cp_data = false)
}
/**
* Remove User
* @param $mode Either 'retain' or 'remove'
*/
* Remove User
*
* @param string $mode Either 'retain' or 'remove'
* @param mixed $user_ids Either an array of integers or an integer
* @param bool $retain_username
* @return bool
*/
function user_delete($mode, $user_ids, $retain_username = true)
{
global $cache, $config, $db, $user, $auth, $phpbb_dispatcher;
global $cache, $config, $db, $user, $phpbb_dispatcher;
global $phpbb_root_path, $phpEx;
$db->sql_transaction('begin');