From 6710ea3947d631f2b407aaf3019b988ff1a04724 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 15 Jan 2016 11:22:13 +0100 Subject: [PATCH] [ticket/14402] Directly pass user id and ip PHPBB3-14402 --- phpBB/phpbb/cron/task/core/tidy_plupload.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/phpBB/phpbb/cron/task/core/tidy_plupload.php b/phpBB/phpbb/cron/task/core/tidy_plupload.php index 6630daa9c1..37d0e9b21a 100644 --- a/phpBB/phpbb/cron/task/core/tidy_plupload.php +++ b/phpBB/phpbb/cron/task/core/tidy_plupload.php @@ -98,9 +98,7 @@ class tidy_plupload extends \phpbb\cron\task\base } catch (\UnexpectedValueException $e) { - $user_id = (empty($this->user->data)) ? ANONYMOUS : $this->user->data['user_id']; - $user_ip = (empty($this->user->ip)) ? '' : $this->user->ip; - $this->log->add('critical', $user_id, $user_ip, 'LOG_PLUPLOAD_TIDY_FAILED', false, array( + $this->log->add('critical', $this->user->data['user_id'], $this->user->ip, 'LOG_PLUPLOAD_TIDY_FAILED', false, array( $this->plupload_upload_path, $e->getMessage(), $e->getTraceAsString()