makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'Marc/ticket/11862' into develop

Browse source 
* Marc/ticket/11862:
  [ticket/11862] Correct var names in user_delete() events due to prune-users
This commit is contained in:
Joas Schilling 2013-09-27 12:58:31 +02:00
commit 9d8d871369
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/functions_user.php
View file

@ -388,12 +388,13 @@ function user_delete($mode, $user_ids, $retain_username = true)
* Event before a user is deleted * Event before a user is deleted
* *
* @event core.delete_user_before * @event core.delete_user_before
* @var string mode Mode of deletion (retain/delete posts) * @var string mode Mode of deletion (retain/delete posts)
* @var int user_id ID of the deleted user * @var int user_ids IDs of the deleted user
* @var mixed post_username Guest username that is being used or false * @var mixed retain_username True if username should be retained
* or false if not
* @since 3.1-A1 * @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))); extract($phpbb_dispatcher->trigger_event('core.delete_user_before', compact($vars)));
// Before we begin, we will remove the reports the user issued. // 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 after a user is deleted
* *
* @event core.delete_user_after * @event core.delete_user_after
* @var string mode Mode of deletion (retain/delete posts) * @var string mode Mode of deletion (retain/delete posts)
* @var int user_id ID of the deleted user * @var int user_id IDs of the deleted user
* @var mixed post_username Guest username that is being used or false * @var mixed retain_username True if username should be retained
* or false if not
* @since 3.1-A1 * @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))); extract($phpbb_dispatcher->trigger_event('core.delete_user_after', compact($vars)));
// Reset newest user info if appropriate // Reset newest user info if appropriate