aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-04-30 17:39:53 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2011-04-30 17:41:04 -0400
commitaa7be58d41b5522277740535d84115f90170c79a (patch)
tree0ab8d94875be9fb4dae9c10de3caccc783db7902
parent850741ee16d7505069829bed35f90c599ef73369 (diff)
parent1d2201902f0f3789daf02ca054f33f4b4bfa3eb2 (diff)
downloadforums-aa7be58d41b5522277740535d84115f90170c79a.tar
forums-aa7be58d41b5522277740535d84115f90170c79a.tar.gz
forums-aa7be58d41b5522277740535d84115f90170c79a.tar.bz2
forums-aa7be58d41b5522277740535d84115f90170c79a.tar.xz
forums-aa7be58d41b5522277740535d84115f90170c79a.zip
Merge branch 'erikfrerejean/ticket/9961' into develop-olympus
* erikfrerejean/ticket/9961: [ticket/9961] Create log entries when users are activated.
-rw-r--r--phpBB/includes/ucp/ucp_activate.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index 8debaabf31..b00c1b9f52 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -98,6 +98,13 @@ class ucp_activate
SET user_actkey = ''
WHERE user_id = {$user_row['user_id']}";
$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)