diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-28 22:12:26 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-28 22:12:26 +0100 |
| commit | 8a7607964fa129dc82cdb7b26be7aaa7da565363 (patch) | |
| tree | 7bc583ffac24f4cc65787408642eaa3f0f430d60 /phpBB/includes/functions_user.php | |
| parent | cb406258fe13f593035f0cd29e5835752985629c (diff) | |
| parent | 54e31efcbc7a310c00ec81b8b71da0af2ebea8da (diff) | |
| download | forums-8a7607964fa129dc82cdb7b26be7aaa7da565363.tar forums-8a7607964fa129dc82cdb7b26be7aaa7da565363.tar.gz forums-8a7607964fa129dc82cdb7b26be7aaa7da565363.tar.bz2 forums-8a7607964fa129dc82cdb7b26be7aaa7da565363.tar.xz forums-8a7607964fa129dc82cdb7b26be7aaa7da565363.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 227ac3fe0c..8e1a9007e3 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1299,7 +1299,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas */ function user_unban($mode, $ban) { - global $db, $user, $cache, $phpbb_log; + global $db, $user, $cache, $phpbb_log, $phpbb_dispatcher; // Delete stale bans $sql = 'DELETE FROM ' . BANLIST_TABLE . ' @@ -1373,6 +1373,20 @@ function user_unban($mode, $ban) )); } } + + /** + * 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); |