diff options
| author | javiexin <javiexin@gmail.com> | 2017-02-15 23:56:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 23:56:52 +0100 |
| commit | 7f69580df3b6125941fc39d63f8498488f32231a (patch) | |
| tree | f7c3816515cdbe98aee078f8ece97d79f77bd017 /phpBB/includes/functions_user.php | |
| parent | 7646280d518a4f637ec267fadb5e563f5b149512 (diff) | |
| parent | b567c6e2414d069ba54f7a924c952069aa115237 (diff) | |
| download | forums-7f69580df3b6125941fc39d63f8498488f32231a.tar forums-7f69580df3b6125941fc39d63f8498488f32231a.tar.gz forums-7f69580df3b6125941fc39d63f8498488f32231a.tar.bz2 forums-7f69580df3b6125941fc39d63f8498488f32231a.tar.xz forums-7f69580df3b6125941fc39d63f8498488f32231a.zip | |
Merge branch '3.1.x' into ticket/15011
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 0b39339c7f..2a421f532f 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -276,7 +276,7 @@ function user_add($user_row, $cp_data = false, $notifications_data = null) * @var array cp_data Array of Custom profile fields submited to user_add * @var array sql_ary Array of data to be inserted when a user is added * @since 3.1.0-a1 - * @change 3.1.0-b5 + * @changed 3.1.0-b5 Added user_row and cp_data */ $vars = array('user_row', 'cp_data', 'sql_ary'); extract($phpbb_dispatcher->trigger_event('core.user_add_modify_data', compact($vars))); @@ -1291,7 +1291,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas */ function user_unban($mode, $ban) { - global $db, $user, $auth, $cache; + global $db, $user, $auth, $cache, $phpbb_dispatcher; // Delete stale bans $sql = 'DELETE FROM ' . BANLIST_TABLE . ' @@ -1358,6 +1358,20 @@ function user_unban($mode, $ban) add_log('user', $user_id, 'LOG_UNBAN_' . strtoupper($mode), $l_unban_list); } } + + /** + * Use this event to perform actions after the unban has been performed + * + * @event core.user_unban + * @var string mode One of the following: user, ip, email + * @var array user_ids_ary Array with user_ids + * @since 3.1.11-RC1 + */ + $vars = array( + 'mode', + 'user_ids_ary', + ); + extract($phpbb_dispatcher->trigger_event('core.user_unban', compact($vars))); } $cache->destroy('sql', BANLIST_TABLE); |