diff --git a/classes/actions/class-content-scan.php b/classes/actions/class-content-scan.php index 38d491e0be..88eba4607e 100644 --- a/classes/actions/class-content-scan.php +++ b/classes/actions/class-content-scan.php @@ -70,7 +70,7 @@ public function update_stats() { [ 'posts_per_page' => static::SCAN_POSTS_PER_PAGE, 'paged' => $current_page, - 'post_type' => $content_helpers->get_post_types_names(), + 'post_type' => \progress_planner()->get_settings()->get_post_types_names(), 'post_status' => 'publish', ] ); @@ -102,7 +102,7 @@ public function get_total_pages() { // Get the total number of posts. $total_posts_count = 0; - foreach ( $content_helpers->get_post_types_names() as $post_type ) { + foreach ( \progress_planner()->get_settings()->get_post_types_names() as $post_type ) { $total_posts_count += \wp_count_posts( $post_type )->publish; } // Calculate the total pages to scan. diff --git a/classes/actions/class-content.php b/classes/actions/class-content.php index 7d3f7dcfc4..e5fc5fee98 100644 --- a/classes/actions/class-content.php +++ b/classes/actions/class-content.php @@ -166,7 +166,7 @@ private function should_skip_saving( $post ) { // Bail if the post is not included in the post-types we're tracking. if ( ! \in_array( $post->post_type, - $content_helpers->get_post_types_names(), + \progress_planner()->get_settings()->get_post_types_names(), true ) ) { return true; diff --git a/classes/activities/class-content-helpers.php b/classes/activities/class-content-helpers.php index 1d18af45fc..423b598c4d 100644 --- a/classes/activities/class-content-helpers.php +++ b/classes/activities/class-content-helpers.php @@ -17,19 +17,12 @@ class Content_Helpers { /** * Get an array of post-types names for the stats. * + * @deprecated 1.9.2 Use \progress_planner()->get_settings()->get_post_types_names() instead. + * * @return string[] */ public function get_post_types_names() { - static $include_post_types; - if ( isset( $include_post_types ) && ! empty( $include_post_types ) ) { - return $include_post_types; - } - $default = [ 'post', 'page' ]; - $include_post_types = \array_filter( - \progress_planner()->get_settings()->get( [ 'include_post_types' ], $default ), - fn( $post_type ) => $post_type && \post_type_exists( $post_type ) && \is_post_type_viewable( $post_type ) - ); - return empty( $include_post_types ) ? $default : \array_values( $include_post_types ); + return \progress_planner()->get_settings()->get_post_types_names(); } /** diff --git a/classes/admin/widgets/class-content-activity.php b/classes/admin/widgets/class-content-activity.php index 0c6198b830..0d6af7e511 100644 --- a/classes/admin/widgets/class-content-activity.php +++ b/classes/admin/widgets/class-content-activity.php @@ -80,7 +80,7 @@ public function filter_activities( $activities ) { $activities, fn( $activity ) => 'delete' === $activity->type || ( \is_object( $activity->get_post() ) - && \in_array( $activity->get_post()->post_type, \progress_planner()->get_activities__content_helpers()->get_post_types_names(), true ) + && \in_array( $activity->get_post()->post_type, \progress_planner()->get_settings()->get_post_types_names(), true ) ) ); } diff --git a/classes/badges/content/class-content-curator.php b/classes/badges/content/class-content-curator.php index bb4e9a3653..0de6961d0a 100644 --- a/classes/badges/content/class-content-curator.php +++ b/classes/badges/content/class-content-curator.php @@ -57,7 +57,7 @@ public function progress_callback( $args = [] ) { // Get the total number of posts. $total_posts_count = 0; - foreach ( \progress_planner()->get_activities__content_helpers()->get_post_types_names() as $post_type ) { + foreach ( \progress_planner()->get_settings()->get_post_types_names() as $post_type ) { $total_posts_count += \wp_count_posts( $post_type )->publish; } diff --git a/views/page-widgets/content-activity.php b/views/page-widgets/content-activity.php index b4a2755057..600653129f 100644 --- a/views/page-widgets/content-activity.php +++ b/views/page-widgets/content-activity.php @@ -26,7 +26,7 @@ ], ]; -$prpl_tracked_post_types = \progress_planner()->get_activities__content_helpers()->get_post_types_names(); +$prpl_tracked_post_types = \progress_planner()->get_settings()->get_post_types_names(); $prpl_activities_count = [ 'all' => 0, ];