diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-02 11:55:16 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-11-02 11:55:16 -0700 |
| commit | 0a3bb18e93bcb8321e09ca313431ae66f2284e7b (patch) | |
| tree | 0a082db6007f7438e51f0fd0b10598d3445b9a88 /phpBB/includes/ucp/ucp_activate.php | |
| parent | 4d6c7223b4fa8946a40ac5779bfa20d4a561a574 (diff) | |
| parent | c5fc8c43cbca82d2a064859828950477cfd5d767 (diff) | |
| download | forums-0a3bb18e93bcb8321e09ca313431ae66f2284e7b.tar forums-0a3bb18e93bcb8321e09ca313431ae66f2284e7b.tar.gz forums-0a3bb18e93bcb8321e09ca313431ae66f2284e7b.tar.bz2 forums-0a3bb18e93bcb8321e09ca313431ae66f2284e7b.tar.xz forums-0a3bb18e93bcb8321e09ca313431ae66f2284e7b.zip | |
Merge pull request #1812 from prototech/ticket/11746
[ticket/11746] Add "admin activation required" notification.
Diffstat (limited to 'phpBB/includes/ucp/ucp_activate.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_activate.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 898dacd831..2a94acbe02 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -27,7 +27,7 @@ class ucp_activate function main($id, $mode) { global $config, $phpbb_root_path, $phpEx; - global $db, $user, $auth, $template; + global $db, $user, $auth, $template, $phpbb_container; $user_id = request_var('u', 0); $key = request_var('k', ''); @@ -108,6 +108,9 @@ class ucp_activate if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !$update_password) { + $phpbb_notifications = $phpbb_container->get('notification_manager'); + $phpbb_notifications->delete_notifications('admin_activate_user', $user_row['user_id']); + include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); $messenger = new messenger(false); |