aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-08-21 00:44:27 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-08-21 00:44:27 +0200
commitb2701f00e9e882c301625861df9c859c6c620375 (patch)
tree624354dfa7de81b468313b378f5bc5edaf4beee8 /phpBB/includes/acp
parent19aecaf7c7d2e4532f9b79a5eb1bc32e8c6fae45 (diff)
parent31aac66f5aca218254a6ff199c21a282bc6059bc (diff)
downloadforums-b2701f00e9e882c301625861df9c859c6c620375.tar
forums-b2701f00e9e882c301625861df9c859c6c620375.tar.gz
forums-b2701f00e9e882c301625861df9c859c6c620375.tar.bz2
forums-b2701f00e9e882c301625861df9c859c6c620375.tar.xz
forums-b2701f00e9e882c301625861df9c859c6c620375.zip
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_users.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 6228b41b52..b6c6a7d4d9 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -404,7 +404,7 @@ 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']);
+ $phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_row['user_id']);
include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);