Merge branch 'develop' into filip/alternative-lock

Author: aristath

classes/class-suggested-tasks.php

@@ -444,7 +444,7 @@ public function rest_prepare_recommendation( $response, $post ) {
 			Check if task was completed before - for example, comments were disabled and then re-enabled, and remove points if so.
 			 * Those are tasks which are completed by toggling an option, so non repetitive & not user tasks.
 			*/
-			if ( ! $provider->is_repetitive() && $provider->task_has_activity( $response->data['meta']['prpl_task_id'] ) ) {
+			if ( ! \has_term( 'user', 'prpl_recommendations_provider', $post->ID ) && ! $provider->is_repetitive() && $provider->task_has_activity( $response->data['meta']['prpl_task_id'] ) ) {
 				$response->data['meta']['prpl_points'] = 0;
 			}
 		}

views/page-widgets/badge-streak-maintenance.php

@@ -9,7 +9,7 @@
 	exit;
 }
 
-$prpl_widget_details = \progress_planner()->get_admin__widgets__badge_streak_content()->get_details( 'maintenance' );
+$prpl_widget_details = \progress_planner()->get_admin__widgets__badge_streak_maintenance()->get_details( 'maintenance' );
 if ( ! $prpl_widget_details ) {
 	return;
 }