diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-10-03 10:04:59 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-03 10:04:59 +0200 |
| commit | 7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c (patch) | |
| tree | aceb567afda7467738ab6b693dc9595a40ac7f2f /phpBB/includes/functions_user.php | |
| parent | 93531e7fb0df7d9cd2de04ca06aa9eb6a847a1c4 (diff) | |
| parent | 49ce2c13b26e358b4ccef440094a8fa4b6b9afd7 (diff) | |
| download | forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.gz forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.bz2 forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.tar.xz forums-7006db7a2dd68ec7f7ca3a24d9afa656056f9d8c.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
phpBB/includes/functions.php
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index c248be0864..0a0656377c 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -388,12 +388,13 @@ function user_delete($mode, $user_ids, $retain_username = true) * Event before a user is deleted * * @event core.delete_user_before - * @var string mode Mode of deletion (retain/delete posts) - * @var int user_id ID of the deleted user - * @var mixed post_username Guest username that is being used or false + * @var string mode Mode of deletion (retain/delete posts) + * @var array user_ids IDs of the deleted user + * @var mixed retain_username True if username should be retained + * or false if not * @since 3.1-A1 */ - $vars = array('mode', 'user_id', 'post_username'); + $vars = array('mode', 'user_ids', 'retain_username'); extract($phpbb_dispatcher->trigger_event('core.delete_user_before', compact($vars))); // Before we begin, we will remove the reports the user issued. @@ -616,12 +617,13 @@ function user_delete($mode, $user_ids, $retain_username = true) * Event after a user is deleted * * @event core.delete_user_after - * @var string mode Mode of deletion (retain/delete posts) - * @var int user_id ID of the deleted user - * @var mixed post_username Guest username that is being used or false + * @var string mode Mode of deletion (retain/delete posts) + * @var array user_ids IDs of the deleted user + * @var mixed retain_username True if username should be retained + * or false if not * @since 3.1-A1 */ - $vars = array('mode', 'user_id', 'post_username'); + $vars = array('mode', 'user_ids', 'retain_username'); extract($phpbb_dispatcher->trigger_event('core.delete_user_after', compact($vars))); // Reset newest user info if appropriate |