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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2016-12-28 22:12:48 +01:00
commit 4ca90795af
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/includes/functions_user.php
View file

@ -1299,7 +1299,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
*/ */
function user_unban($mode, $ban) function user_unban($mode, $ban)
{ {
global $db, $user, $cache, $phpbb_log; global $db, $user, $cache, $phpbb_log, $phpbb_dispatcher;
// Delete stale bans // Delete stale bans
$sql = 'DELETE FROM ' . BANLIST_TABLE . ' $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); $cache->destroy('sql', BANLIST_TABLE);