aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_users.php
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-11-02 11:55:16 -0700
committerNathan Guse <nathaniel.guse@gmail.com>2013-11-02 11:55:16 -0700
commit0a3bb18e93bcb8321e09ca313431ae66f2284e7b (patch)
tree0a082db6007f7438e51f0fd0b10598d3445b9a88 /phpBB/includes/acp/acp_users.php
parent4d6c7223b4fa8946a40ac5779bfa20d4a561a574 (diff)
parentc5fc8c43cbca82d2a064859828950477cfd5d767 (diff)
downloadforums-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/acp/acp_users.php')
-rw-r--r--phpBB/includes/acp/acp_users.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 52f9b7149d..fd9c17f171 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -396,6 +396,9 @@ class acp_users
{
if ($config['require_activation'] == USER_ACTIVATION_ADMIN)
{
+ $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);