aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_activate.php
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2013-10-24 02:37:20 -0700
committerCesar G <prototech91@gmail.com>2013-10-24 02:37:20 -0700
commitd607f1c927ed6fb54d6c46eb13b5bcd4133f8cfc (patch)
tree28e6ee53079f2a80446832aea4b95b2d6aa23cf4 /phpBB/includes/ucp/ucp_activate.php
parent2adf3d7a3473fe8d01e850329bd935e97f09668d (diff)
downloadforums-d607f1c927ed6fb54d6c46eb13b5bcd4133f8cfc.tar
forums-d607f1c927ed6fb54d6c46eb13b5bcd4133f8cfc.tar.gz
forums-d607f1c927ed6fb54d6c46eb13b5bcd4133f8cfc.tar.bz2
forums-d607f1c927ed6fb54d6c46eb13b5bcd4133f8cfc.tar.xz
forums-d607f1c927ed6fb54d6c46eb13b5bcd4133f8cfc.zip
[ticket/11746] Add "admin activation required" notification.
PHPBB3-11746
Diffstat (limited to 'phpBB/includes/ucp/ucp_activate.php')
-rw-r--r--phpBB/includes/ucp/ucp_activate.php5
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..6af0154334 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->mark_notifications_read('admin_activate_user', $user_row['user_id'], false);
+
include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
$messenger = new messenger(false);