Merge pull request #534 from ProgressPlanner/filip/v17/fix-update-transients

Fix "Perform all updates" task was incorrectly marked as completed

Author: aristath

CHANGELOG.md

@@ -1,3 +1,10 @@
+= 1.7.0 =
+
+Bugs we fixed:
+
+* Fix issue where "Perform all updates" task was incorrectly marked as completed.
+
+
 = 1.6.1 =
 
 Bugs we fixed:

classes/class-suggested-tasks.php

@@ -45,7 +45,7 @@ public function __construct() {
 		$this->tasks_manager = new Tasks_Manager();
 
 		if ( \is_admin() ) {
-			\add_action( 'init', [ $this, 'init' ], 100 ); // Wait for the post types to be initialized.
+			\add_action( 'admin_init', [ $this, 'init' ], 20 ); // Wait for the post types to be initialized and transients to be set.
 
 			// Check GET parameter and maybe set task as pending.
 			\add_action( 'init', [ $this, 'maybe_complete_task' ] );

classes/suggested-tasks/providers/class-core-update.php

@@ -124,6 +124,19 @@ public function should_add_task() {
 		if ( ! \function_exists( 'get_core_updates' ) ) {
 			require_once ABSPATH . 'wp-admin/includes/update.php'; // @phpstan-ignore requireOnce.fileNotFound
 		}
+
+		// For wp_get_update_data() to return correct data it needs to be called after the 'admin_init' action (with priority 10).
 		return 0 < \wp_get_update_data()['counts']['total'];
 	}
+
+	/**
+	 * Check if the task is completed.
+	 *
+	 * @param string $task_id The task ID.
+	 *
+	 * @return bool
+	 */
+	public function is_task_completed( $task_id = '' ) {
+		return \wp_doing_ajax() ? false : ! $this->should_add_task();
+	}
 }