diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-09-27 12:58:31 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-09-27 12:58:31 +0200 |
| commit | 9d8d87136934f7aad6d31fd4ae13034374e2be74 (patch) | |
| tree | 1fe775bf61cf2c64711f34fe1d8df3f5025da730 /phpBB/includes | |
| parent | 8db820be634cfce0fdb079fdbaee2c49661a7870 (diff) | |
| parent | 2c92123ca59d044c33de3d8e04b02451b008670d (diff) | |
| download | forums-9d8d87136934f7aad6d31fd4ae13034374e2be74.tar forums-9d8d87136934f7aad6d31fd4ae13034374e2be74.tar.gz forums-9d8d87136934f7aad6d31fd4ae13034374e2be74.tar.bz2 forums-9d8d87136934f7aad6d31fd4ae13034374e2be74.tar.xz forums-9d8d87136934f7aad6d31fd4ae13034374e2be74.zip | |
Merge remote-tracking branch 'Marc/ticket/11862' into develop
* Marc/ticket/11862:
[ticket/11862] Correct var names in user_delete() events due to prune-users
Diffstat (limited to 'phpBB/includes')
| -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..fc04d57fa0 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 int 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 int user_id 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 |