makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/security/276] Add missing information message

Browse source 
SECURITY-276
This commit is contained in:
Marc Alexander 2024-04-28 13:51:29 +02:00
parent f853f6523f
commit 24dd47adcf
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_resend.php
View file

@ -76,7 +76,7 @@ class ucp_resend
// Do not resend activation email if valid one still exists // Do not resend activation email if valid one still exists
if (!empty($user_row['user_actkey']) && (int) $user_row['user_actkey_expiration'] >= time()) if (!empty($user_row['user_actkey']) && (int) $user_row['user_actkey_expiration'] >= time())
{ {
trigger_error('ACTIVATION_EMAIL_ALREADY_SENT'); trigger_error('ACTIVATION_ALREADY_SENT');
} }
// Determine coppa status on group (REGISTERED(_COPPA)) // Determine coppa status on group (REGISTERED(_COPPA))

1
phpBB/language/en/common.php
View file

@ -64,6 +64,7 @@ $lang = array_merge($lang, array(
'ACCOUNT_DEACTIVATED' => 'Your account has been manually deactivated and is only able to be reactivated by an administrator.', 'ACCOUNT_DEACTIVATED' => 'Your account has been manually deactivated and is only able to be reactivated by an administrator.',
'ACP' => 'Administration Control Panel', 'ACP' => 'Administration Control Panel',
'ACP_SHORT' => 'ACP', 'ACP_SHORT' => 'ACP',
'ACTIVATION_ALREADY_SENT' => 'The activation email has already been sent to your email address. You can try again after 24 hours. If you continue to have problems activating your account, please contact a board administrator.',
'ACTIVE' => 'active', 'ACTIVE' => 'active',
'ACTIVE_ERROR' => 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.', 'ACTIVE_ERROR' => 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.',
'ADMINISTRATOR' => 'Administrator', 'ADMINISTRATOR' => 'Administrator',