aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_activate.php
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-04-30 20:44:42 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2011-04-30 20:44:42 -0400
commita4a9e380074a8d30cd8d2c80948f86bf594c720e (patch)
tree3b5322d1b622b6d12618f2a52bdd1bc7800b1a2f /phpBB/includes/ucp/ucp_activate.php
parent835391c83af57632b051302dfdb8d82f9b5017c1 (diff)
parentaa7be58d41b5522277740535d84115f90170c79a (diff)
downloadforums-a4a9e380074a8d30cd8d2c80948f86bf594c720e.tar
forums-a4a9e380074a8d30cd8d2c80948f86bf594c720e.tar.gz
forums-a4a9e380074a8d30cd8d2c80948f86bf594c720e.tar.bz2
forums-a4a9e380074a8d30cd8d2c80948f86bf594c720e.tar.xz
forums-a4a9e380074a8d30cd8d2c80948f86bf594c720e.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9961] Create log entries when users are activated.
Diffstat (limited to 'phpBB/includes/ucp/ucp_activate.php')
-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 c10516c769..34b0b6d879 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)