Move registration of 'purge_orphaned_scheduled_tasks' into Scheduler.

2 files changed, 9 insertions, 7 deletions

diff --git a/classes/RSSUtils.php b/classes/RSSUtils.php
index 6ef4860c6..b0cfc4823 100644
--- a/classes/RSSUtils.php
+++ b/classes/RSSUtils.php
@@ -1702,12 +1702,6 @@ class RSSUtils {
 
 		$scheduler = Scheduler::getInstance();
 
-		$scheduler->add_scheduled_task('purge_orphaned_scheduled_tasks', '@weekly',
-			function() use ($scheduler) {
-				return $scheduler->purge_orphaned_tasks();
-			}
-		);
-
 		$scheduler->add_scheduled_task('purge_orphans', '@daily',
 			function() {
 				Article::_purge_orphans();
diff --git a/classes/Scheduler.php b/classes/Scheduler.php
index f86feed65..13d8e94ea 100644
--- a/classes/Scheduler.php
+++ b/classes/Scheduler.php
@@ -7,6 +7,14 @@ class Scheduler {
 	/** @var array<string, mixed> */
 	private array $scheduled_tasks = [];
 
+	function __construct() {
+		$this->add_scheduled_task('purge_orphaned_scheduled_tasks', '@weekly',
+			function() {
+				return $this->purge_orphaned_tasks();
+			}
+		);
+	}
+
 	public static function getInstance(): Scheduler {
 		if (self::$instance == null)
 			self::$instance = new self();
@@ -126,7 +134,7 @@ class Scheduler {
 	 *
 	 * @return int 0 if successful, 1 on failure
 	 */
-	function purge_orphaned_tasks(): int {
+	private function purge_orphaned_tasks(): int {
 		if (!$this->scheduled_tasks) {
 			Debug::log(__METHOD__ . ' was invoked before scheduled tasks have been registered.  This should never happen.');
 			return 1;