diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-01-23 00:21:01 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-01-23 00:21:01 +0100 |
| commit | 447e845274daedd12bc40f813680fb5df64d114a (patch) | |
| tree | 24a389203df5e17e953d7b9c5bb1e0bfa28e971b /phpBB/includes/functions.php | |
| parent | e8fd8b9a4b37f7d7d3955cd2b0d79139a2c0222d (diff) | |
| download | forums-447e845274daedd12bc40f813680fb5df64d114a.tar forums-447e845274daedd12bc40f813680fb5df64d114a.tar.gz forums-447e845274daedd12bc40f813680fb5df64d114a.tar.bz2 forums-447e845274daedd12bc40f813680fb5df64d114a.tar.xz forums-447e845274daedd12bc40f813680fb5df64d114a.zip | |
[ticket/10714] Remove fallback code from previous commits and move global
PHPBB3-10714
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 12 |
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; |