Changeset 25578

Timestamp:

09/23/2013 07:07:08 PM (13 years ago)

Author:

nacin

Message:

In wp_count_posts(), rename 'count_posts' hook to 'wp_count_posts', for clarity. see #16603.

Location:

trunk

Files:

• src/wp-includes/post.php (modified) (1 diff)
• tests/phpunit/tests/post.php (modified) (1 diff)

trunk/src/wp-includes/post.php

@@ -2110 +2110 @@
 
         $counts = wp_cache_get( $cache_key, 'counts' );
-        if ( false !== $counts ) {
-                /**
-                 * Modify returned post counts by status for the current post type.
-                 *
-                 * @since 3.7.0
-                 *
-                 * @param object $counts An object containing the current post_type's post counts by status.
-                 * @param string $type   The post type.
-                 * @param string $perm   The permission to determine if the posts are 'readable' by the current user.
-                 */
-                return apply_filters( 'count_posts', $counts, $type, $perm );
-        }
-
-        $results = (array) $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A );
-
-        $counts = array_fill_keys( get_post_stati(), 0 );
-
-        foreach ( $results as $row )
-                $counts[ $row['post_status'] ] = $row['num_posts'];
-
-        $counts = (object) $counts;
-        wp_cache_set( $cache_key, $counts, 'counts' );
-
-        //duplicate_hook
-        return apply_filters( 'count_posts', $counts, $type, $perm );
+        if ( false === $counts ) {
+                $results = (array) $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A );
+                $counts = array_fill_keys( get_post_stati(), 0 );
+
+                foreach ( $results as $row )
+                        $counts[ $row['post_status'] ] = $row['num_posts'];
+
+                $counts = (object) $counts;
+                wp_cache_set( $cache_key, $counts, 'counts' );
+        }
+
+        /**
+         * Modify returned post counts by status for the current post type.
+         *
+         * @since 3.7.0
+         *
+         * @param object $counts An object containing the current post_type's post counts by status.
+         * @param string $type   The post type.
+         * @param string $perm   The permission to determine if the posts are 'readable' by the current user.
+         */
+        return apply_filters( 'wp_count_posts', $counts, $type, $perm );
 }
 

trunk/tests/phpunit/tests/post.php

@@ -818 +818 @@
                 $count1 = wp_count_posts( $post_type, 'readable' );
                 $this->assertEquals( 10, $count1->publish );
-                add_filter( 'count_posts', array( $this, 'filter_wp_count_posts' ) );
+                add_filter( 'wp_count_posts', array( $this, 'filter_wp_count_posts' ) );
 
                 $count2 = wp_count_posts( $post_type, 'readable' );
                 $this->assertEquals( 7, $count2->publish );
 
-                remove_filter( 'count_posts', array( $this, 'filter_wp_count_posts' ) );
+                remove_filter( 'wp_count_posts', array( $this, 'filter_wp_count_posts' ) );
         }