1 files changed, 8 insertions, 14 deletions
diff --git a/phpBB/includes/cron/task/wrapper.php b/phpBB/includes/cron/task/wrapper.php
index 66c45189e5..386fb5b383 100644
--- a/phpBB/includes/cron/task/wrapper.php
+++ b/phpBB/includes/cron/task/wrapper.php
@@ -23,6 +23,10 @@ if (!defined('IN_PHPBB'))
 */
 class phpbb_cron_task_wrapper
 {
+	protected $task;
+	protected $phpbb_root_path;
+	protected $php_ext;
+
 	/**
 	* Constructor.
 	*
@@ -30,9 +34,11 @@ class phpbb_cron_task_wrapper
 	*
 	* @param phpbb_cron_task $task The cron task to wrap.
 	*/
-	public function __construct(phpbb_cron_task $task)
+	public function __construct(phpbb_cron_task $task, $phpbb_root_path, $php_ext)
 	{
 		$this->task = $task;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $php_ext;
 	}
 
 	/**
@@ -62,16 +68,6 @@ class phpbb_cron_task_wrapper
 	}
 
 	/**
-	* Returns the name of wrapped task. It is the same as the wrapped class's class name.
-	*
-	* @return string		Class name of wrapped task.
-	*/
-	public function get_name()
-	{
-		return get_class($this->task);
-	}
-
-	/**
 	* Returns a url through which this task may be invoked via web.
 	*
 	* When system cron is not in use, running a cron task is accomplished
@@ -82,8 +78,6 @@ class phpbb_cron_task_wrapper
 	*/
 	public function get_url()
 	{
-		global $phpbb_root_path, $phpEx;
-
 		$name = $this->get_name();
 		if ($this->is_parametrized())
 		{
@@ -98,7 +92,7 @@ class phpbb_cron_task_wrapper
 		{
 			$extra = '';
 		}
-		$url = append_sid($phpbb_root_path . 'cron.' . $phpEx, 'cron_type=' . $name . $extra);
+		$url = append_sid($this->phpbb_root_path . 'cron.' . $this->php_ext, 'cron_type=' . $name . $extra);
 		return $url;
 	}