mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-25 12:35:55 +02:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9961] Create log entries when users are activated.
This commit is contained in:
@ -98,6 +98,13 @@ class ucp_activate
|
|||||||
SET user_actkey = ''
|
SET user_actkey = ''
|
||||||
WHERE user_id = {$user_row['user_id']}";
|
WHERE user_id = {$user_row['user_id']}";
|
||||||
$db->sql_query($sql);
|
$db->sql_query($sql);
|
||||||
|
|
||||||
|
// Create the correct logs
|
||||||
|
add_log('user', $user_row['user_id'], 'LOG_USER_ACTIVE_USER');
|
||||||
|
if ($auth->acl_get('a_user'))
|
||||||
|
{
|
||||||
|
add_log('admin', 'LOG_USER_ACTIVE', $user_row['username']);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !$update_password)
|
if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !$update_password)
|
||||||
|
Reference in New Issue
Block a user