Changeset 60792

Timestamp:

09/22/2025 06:48:39 PM (3 weeks ago)

Author:

westonruter

Message:

Posts, Post Types: Refactor preparation of query for wp_count_posts().

Follow-up to [60788].

Props mukesh27, westonruter.
See #61097.

Location:

trunk

Files:

• src/wp-includes/post.php (modified) (2 diffs)
• tests/phpunit/tests/post.php (modified) (2 diffs)

trunk/src/wp-includes/post.php

@@ -3407 +3407 @@
     ) {
         // Optimized query uses subqueries which can leverage DB indexes for better performance. See #61097.
-        $query = $wpdb->prepare(
-            "
+        $query = "
             SELECT post_status, COUNT(*) AS num_posts
             FROM (
@@ -3419 +3418 @@
                 WHERE post_type = %s AND post_status = 'private' AND post_author = %d
             ) AS filtered_posts
-            ",
-            $type,
-            $type,
-            get_current_user_id()
-        );
+        ";
+        $args  = array( $type, $type, get_current_user_id() );
     } else {
-        $query = $wpdb->prepare(
-            "
+        $query = "
             SELECT post_status, COUNT(*) AS num_posts
             FROM {$wpdb->posts}
             WHERE post_type = %s
-            ",
-            $type
-        );
-    }
-
-    $query  .= ' GROUP BY post_status';
-    $results = (array) $wpdb->get_results( $query, ARRAY_A );
+        ";
+        $args  = array( $type );
+    }
+
+    $query .= ' GROUP BY post_status';
+
+    $results = (array) $wpdb->get_results(
+        $wpdb->prepare( $query, ...$args ), // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared -- Placeholders are used in the string contained in the variable.
+        ARRAY_A
+    );
     $counts  = array_fill_keys( get_post_stati(), 0 );
 

trunk/tests/phpunit/tests/post.php

@@ -197 +197 @@
      *
      * @ticket 61097
+     *
      * @covers ::wp_count_posts
      */
@@ -223 +224 @@
         );
 
-        $current_user_id = self::$user_ids['author'];
-        wp_set_current_user( $current_user_id );
+        wp_set_current_user( self::$user_ids['author'] );
 
         $count = wp_count_posts( $post_type, 'readable' );