Merge branch 'develop' into filip/fix-user-task-pending

Author: aristath

CHANGELOG.md

@@ -9,6 +9,8 @@ Bugs we fixed:
 * Exclude taxonomies which are marked as not indexable in Yoast SEO
 * Improve completed task check for "Unpublished content" task
 * Remove awarded point if the golden todo task is set back to pending status
+* Fix "Delete the 'Sample Page' page" interactive task
+* Remove 3rd party plugin tasks if they are deactivated.
 
 = 1.7.0 =
 

assets/js/recommendations/sample-page.js

@@ -10,7 +10,7 @@ prplInteractiveTaskFormListener.customSubmit( {
 	taskId: 'sample-page',
 	popoverId: 'prpl-popover-sample-page',
 	callback: () => {
-		const post = new wp.api.models.Post( {
+		const post = new wp.api.models.Page( {
 			id: samplePageData.postId,
 		} );
 		post.fetch().then( () => {

classes/suggested-tasks/class-tasks-manager.php

@@ -254,14 +254,10 @@ public function evaluate_task( Task $task ) {
 			return false;
 		}
 		$task_provider = $this->get_task_provider( $task->provider->slug );
-		if ( ! $task_provider ) {
-			return false;
-		}
-
-		// Check if the task is no longer relevant.
-		if ( ! $task_provider->is_task_relevant() ) {
+		if ( ! $task_provider || ! $task_provider->is_task_relevant() ) {
 			// Remove the task from the published tasks.
 			\progress_planner()->get_suggested_tasks_db()->delete_recommendation( $task->ID );
+			return false;
 		}
 
 		return $task_provider->evaluate_task( $task->task_id );

readme.txt

@@ -121,6 +121,8 @@ Bugs we fixed:
 * Exclude taxonomies which are marked as not indexable in Yoast SEO
 * Improve completed task check for "Unpublished content" task
 * Remove awarded point if the golden todo task is set back to pending status
+* Fix "Delete the 'Sample Page' page" interactive task
+* Remove 3rd party plugin tasks if they are deactivated.
 
 = 1.7.0 =