aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/functions.php12
1 files changed, 2 insertions, 10 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 590fc15aa7..6f9d8ad8d6 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3512,16 +3512,9 @@ function parse_cfg_file($filename, $lines = false)
*/
function add_log()
{
- global $phpbb_log;
+ global $phpbb_log, $user;
$args = func_get_args();
- $log = (isset($args[0])) ? $args[0] : false;
-
- if ($log === false)
- {
- return false;
- }
-
$mode = array_shift($args);
// This looks kind of dirty, but add_log has some additional data before the log_operation
@@ -3539,11 +3532,10 @@ function add_log()
$additional_data['reportee_id'] = array_shift($args);
break;
}
+
$log_operation = array_shift($args);
$additional_data = array_merge($additional_data, $args);
- global $user;
-
$user_id = (empty($user->data)) ? ANONYMOUS : $user->data['user_id'];
$user_ip = (empty($user->ip)) ? '' : $user->ip;