aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/cron/task
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-01-15 11:22:13 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-01-15 11:22:13 +0100
commit6710ea3947d631f2b407aaf3019b988ff1a04724 (patch)
tree3381c46fc05965e2064af733281f746c25e64ffc /phpBB/phpbb/cron/task
parent3a555d94af24645142fe76ba1c691cc2ceb88374 (diff)
downloadforums-6710ea3947d631f2b407aaf3019b988ff1a04724.tar
forums-6710ea3947d631f2b407aaf3019b988ff1a04724.tar.gz
forums-6710ea3947d631f2b407aaf3019b988ff1a04724.tar.bz2
forums-6710ea3947d631f2b407aaf3019b988ff1a04724.tar.xz
forums-6710ea3947d631f2b407aaf3019b988ff1a04724.zip
[ticket/14402] Directly pass user id and ip
PHPBB3-14402
Diffstat (limited to 'phpBB/phpbb/cron/task')
-rw-r--r--phpBB/phpbb/cron/task/core/tidy_plupload.php4
1 files changed, 1 insertions, 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()