diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-26 10:26:52 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-26 10:26:52 -0500 |
| commit | e0ef10128b68cfae9774f6c87cc1a841cacecd8d (patch) | |
| tree | d520415262df9d64ae115789ce221d37a1d4050a /phpBB/includes/functions_user.php | |
| parent | 26dac64d45944dce14b33a9c82e531f01f9a623f (diff) | |
| download | forums-e0ef10128b68cfae9774f6c87cc1a841cacecd8d.tar forums-e0ef10128b68cfae9774f6c87cc1a841cacecd8d.tar.gz forums-e0ef10128b68cfae9774f6c87cc1a841cacecd8d.tar.bz2 forums-e0ef10128b68cfae9774f6c87cc1a841cacecd8d.tar.xz forums-e0ef10128b68cfae9774f6c87cc1a841cacecd8d.zip | |
[ticket/11744] Group join request notification
PHPBB3-11744
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 1b598f7bf7..c4d96e1773 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2635,7 +2635,7 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false, */ function group_user_del($group_id, $user_id_ary = false, $username_ary = false, $group_name = false) { - global $db, $auth, $config, $phpbb_dispatcher; + global $db, $auth, $config, $phpbb_dispatcher, $phpbb_container; if ($config['coppa_enable']) { @@ -2769,6 +2769,10 @@ function group_user_del($group_id, $user_id_ary = false, $username_ary = false, group_update_listings($group_id); + $phpbb_notifications = $phpbb_container->get('notification_manager'); + + $phpbb_notifications->delete_notifications('group_request', $user_id_ary, $group_id); + // Return false - no error return false; } @@ -2858,7 +2862,7 @@ function remove_default_rank($group_id, $user_ids) */ function group_user_attributes($action, $group_id, $user_id_ary = false, $username_ary = false, $group_name = false, $group_attributes = false) { - global $db, $auth, $phpbb_root_path, $phpEx, $config; + global $db, $auth, $phpbb_root_path, $phpEx, $config, $phpbb_container; // We need both username and user_id info $result = user_get_id_name($user_id_ary, $username_ary); @@ -2951,6 +2955,10 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna $messenger->save_queue(); + $phpbb_notifications = $phpbb_container->get('notification_manager'); + + $phpbb_notifications->delete_notifications('group_request', $user_id_ary, $group_id); + $log = 'LOG_USERS_APPROVED'; break; |