diff options
| author | Cesar G <prototech91@gmail.com> | 2013-10-26 01:01:08 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2013-10-26 01:01:08 -0700 |
| commit | c5fc8c43cbca82d2a064859828950477cfd5d767 (patch) | |
| tree | 1dae9a1bc8fc851fad08ed2666aa62cad760384d | |
| parent | d607f1c927ed6fb54d6c46eb13b5bcd4133f8cfc (diff) | |
| download | forums-c5fc8c43cbca82d2a064859828950477cfd5d767.tar forums-c5fc8c43cbca82d2a064859828950477cfd5d767.tar.gz forums-c5fc8c43cbca82d2a064859828950477cfd5d767.tar.bz2 forums-c5fc8c43cbca82d2a064859828950477cfd5d767.tar.xz forums-c5fc8c43cbca82d2a064859828950477cfd5d767.zip | |
[ticket/11746] Delete the notification after user is approved & fix language.
PHPBB3-11746
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_activate.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 2a79ec05c0..3f1f39724e 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -397,7 +397,7 @@ class acp_users if ($config['require_activation'] == USER_ACTIVATION_ADMIN) { $phpbb_notifications = $phpbb_container->get('notification_manager'); - $phpbb_notifications->mark_notifications_read('admin_activate_user', $user_row['user_id'], false); + $phpbb_notifications->delete_notifications('admin_activate_user', $user_row['user_id']); include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 6af0154334..2a94acbe02 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -109,7 +109,7 @@ 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); + $phpbb_notifications->delete_notifications('admin_activate_user', $user_row['user_id']); include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 161ec6c67f..9a5713e1cd 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -326,7 +326,7 @@ $lang = array_merge($lang, array( 'NOTIFICATION_TYPE_QUOTE' => 'Someone quotes you in a post', 'NOTIFICATION_TYPE_REPORT' => 'Someone reports a post', 'NOTIFICATION_TYPE_TOPIC' => 'Someone creates a topic in a forum to which you are subscribed', - 'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER' => 'New registered user requiring activation', + 'NOTIFICATION_TYPE_ADMIN_ACTIVATE_USER' => 'Newly registered user requiring activation', 'NOTIFY_METHOD' => 'Notification method', 'NOTIFY_METHOD_BOTH' => 'Both', |