2 files changed, 14 insertions, 4 deletions
diff --git a/phpBB/config/default/container/services_cron.yml b/phpBB/config/default/container/services_cron.yml
index eb7df540d7..dd3982a659 100644
--- a/phpBB/config/default/container/services_cron.yml
+++ b/phpBB/config/default/container/services_cron.yml
@@ -106,6 +106,8 @@ services:
         arguments:
             - '%core.root_path%'
             - '@config'
+            - '@log'
+            - '@user'
         calls:
             - [set_name, [cron.task.core.tidy_plupload]]
         tags:
diff --git a/phpBB/phpbb/cron/task/core/tidy_plupload.php b/phpBB/phpbb/cron/task/core/tidy_plupload.php
index d7364374af..37d0e9b21a 100644
--- a/phpBB/phpbb/cron/task/core/tidy_plupload.php
+++ b/phpBB/phpbb/cron/task/core/tidy_plupload.php
@@ -42,6 +42,12 @@ class tidy_plupload extends \phpbb\cron\task\base
 	*/
 	protected $config;
 
+	/** @var \phpbb\log\log_interface */
+	protected $log;
+
+	/** @var \phpbb\user */
+	protected $user;
+
 	/**
 	* Directory where plupload stores temporary files.
 	* @var string
@@ -53,11 +59,15 @@ class tidy_plupload extends \phpbb\cron\task\base
 	*
 	* @param string $phpbb_root_path The root path
 	* @param \phpbb\config\config $config The config
+	* @param \phpbb\log\log_interface $log Log
+	* @param \phpbb\user $user User object
 	*/
-	public function __construct($phpbb_root_path, \phpbb\config\config $config)
+	public function __construct($phpbb_root_path, \phpbb\config\config $config, \phpbb\log\log_interface $log, \phpbb\user $user)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->config = $config;
+		$this->log = $log;
+		$this->user = $user;
 
 		$this->plupload_upload_path = $this->phpbb_root_path . $this->config['upload_path'] . '/plupload';
 	}
@@ -67,8 +77,6 @@ class tidy_plupload extends \phpbb\cron\task\base
 	*/
 	public function run()
 	{
-		global $user, $phpbb_log;
-
 		// Remove old temporary file (perhaps failed uploads?)
 		$last_valid_timestamp = time() - $this->max_file_age;
 		try
@@ -90,7 +98,7 @@ class tidy_plupload extends \phpbb\cron\task\base
 		}
 		catch (\UnexpectedValueException $e)
 		{
-			$phpbb_log->add('critical', $user->data['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()