Ticket #24803: 24803.2.diff

wp-includes/post.php

@@ -2032 +2032 @@
  * The $perm parameter checks for 'readable' value and if the user can read
  * private posts, it will display that for the user that is signed in.
  *
+ * This function will return a WP_Error object if the post type is invalid
+ *
  * @since 2.5.0
  * @link http://codex.wordpress.org/Template_Tags/wp_count_posts
  *
  * @param string $type Optional. Post type to retrieve count
  * @param string $perm Optional. 'readable' or empty.
- * @return object Number of posts for each status
+ * @return object|WP_Error Number of posts for each status, WP_Error if $type is invalid
  */
 function wp_count_posts( $type = 'post', $perm = '' ) {
         global $wpdb;
 
+        if ( ! post_type_exists( $type ) ) {
+                return new WP_Error( 'invalid_post_type', __( 'Invalid post type' ) );
+        }
+
         $user = wp_get_current_user();
 
         $cache_key = $type;
 
-        $query = "SELECT post_status, COUNT( * ) AS num_posts FROM {$wpdb->posts} WHERE post_type = %s";
+        $query = "xSELECT post_status, COUNT( * ) AS num_posts FROM {$wpdb->posts} WHERE post_type = %s";
         if ( 'readable' == $perm && is_user_logged_in() ) {
                 $post_type_object = get_post_type_object($type);
                 if ( !current_user_can( $post_type_object->cap->read_private_posts ) ) {