diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-23 09:17:38 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-23 09:31:13 +0200 |
| commit | 9ff6358dc98987fdf0c7512584aa03392594bcf0 (patch) | |
| tree | 2e78afa7485bb4d7da1170c1c0051fad056e4a07 /phpBB/includes/functions_user.php | |
| parent | bef207e9b747539fdd1d1961e431e10b77b31ab6 (diff) | |
| parent | bea5f94de654df6b009d6058816ad500836469b3 (diff) | |
| download | forums-9ff6358dc98987fdf0c7512584aa03392594bcf0.tar forums-9ff6358dc98987fdf0c7512584aa03392594bcf0.tar.gz forums-9ff6358dc98987fdf0c7512584aa03392594bcf0.tar.bz2 forums-9ff6358dc98987fdf0c7512584aa03392594bcf0.tar.xz forums-9ff6358dc98987fdf0c7512584aa03392594bcf0.zip | |
Merge branch 'ticket/10729' into ticket/10729-asc
Conflicts:
phpBB/includes/functions_user.php
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index ac3dcd02ff..369c59dabb 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -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'); |