Skip to:
Content

bbPress.org

Changeset 6058


Ignore:
Timestamp:
06/05/2016 06:55:24 PM (6 years ago)
Author:
johnjamesjacoby
Message:

Core: Revert accidental removal of r6054 from r6056.

Location:
trunk/src/includes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/includes/common/functions.php

    r6056 r6058  
    956956     * @param string $blacklist List of blacklist keys. One per new line.
    957957     */
    958     $blacklist = apply_filters(
    959         'bbp_blacklist_keys',
    960         trim( get_option( 'blacklist_keys' )
    961     ) );
     958    $blacklist = apply_filters( 'bbp_blacklist_keys', trim( get_option( 'blacklist_keys' ) ) );
    962959
    963960    // Bail if blacklist is empty
  • trunk/src/includes/core/actions.php

    r6056 r6058  
    341341
    342342// Clean bbPress post caches when WordPress's is cleaned
    343 add_action( 'clean_post_cache', 'bbp_clean_post_cache' );
     343add_action( 'clean_post_cache', 'bbp_clean_post_cache', 10, 2 );
    344344
    345345/**
  • trunk/src/includes/core/cache.php

    r6056 r6058  
    133133 *
    134134 * @uses do_action() Calls 'bbp_clean_post_cache' on $id
    135  * @param object|int $_post The post object or ID to remove from the cache
     135 * @since 2.6.0 bbPress (r6053) Introduced the `$post_id` parameter.
     136 *
     137 * @param int     $post_id The post id.
     138 * @param WP_Post $post    The WP_Post object.
     139 *
     140 * @uses get_post() To get the post object.
     141 * @uses bbp_get_forum_post_type() To get the forum post type.
     142 * @uses bbp_get_topic_post_type() To get the topic post type.
     143 * @uses bbp_get_reply_post_type() To get the reply post type.
     144 * @uses wp_cache_delete() To delete the cache item.
     145 * @uses clean_object_term_cache() To clean the term cache.
     146 * @uses bbp_clean_post_cache() Recursion.
    136147 */
    137 function bbp_clean_post_cache( $_post = '' ) {
     148function bbp_clean_post_cache( $post_id = null, $post = null ) {
     149
     150    // Get the post object.
     151    if ( null !== $post ) {
     152        $post = get_post( $post );
     153    } else {
     154        $post = get_post( $post_id );
     155    }
    138156
    139157    // Bail if no post
    140     $_post = get_post( $_post );
    141     if ( empty( $_post ) ) {
     158    if ( empty( $post ) ) {
    142159        return;
    143160    }
     
    151168
    152169    // Bail if not a bbPress post type
    153     if ( ! in_array( $_post->post_type, $post_types, true ) ) {
     170    if ( ! in_array( $post->post_type, $post_types, true ) ) {
    154171        return;
    155172    }
    156173
    157     wp_cache_delete( $_post->ID, 'posts'     );
    158     wp_cache_delete( $_post->ID, 'post_meta' );
    159 
    160     clean_object_term_cache( $_post->ID, $_post->post_type );
    161 
    162     do_action( 'bbp_clean_post_cache', $_post->ID, $_post );
     174    // Be sure we haven't recached the post data
     175    wp_cache_delete( $post->ID, 'posts'    );
     176    wp_cache_delete( $post->ID, 'post_meta' );
     177
     178    // Clean the term cache for the given post
     179    clean_object_term_cache( $post->ID, $post->post_type );
    163180
    164181    // Loop through query types and clean caches
    165182    foreach ( $post_types as $post_type ) {
    166         wp_cache_delete( 'bbp_parent_all_'    . $_post->ID . '_type_' . $post_type . '_child_ids',     'bbpress_posts' );
    167     }
     183        wp_cache_delete( 'bbp_parent_all_' . $post->ID . '_type_' . $post_type . '_child_ids', 'bbpress_posts' );
     184    }
     185
     186    /**
     187     * Fires immediately after the given post's cache is cleaned.
     188     *
     189     * @since 2.1.0
     190     *
     191     * @param int     $post_id Post ID.
     192     * @param WP_Post $post    Post object.
     193     */
     194    do_action( 'bbp_clean_post_cache', $post->ID, $post );
    168195
    169196    // Invalidate parent caches
    170     if ( ! empty( $_post->post_parent ) ) {
    171         bbp_clean_post_cache( $_post->post_parent );
     197    if ( ! empty( $post->post_parent ) ) {
     198        bbp_clean_post_cache( $post->post_parent );
    172199    }
    173200}
Note: See TracChangeset for help on using the changeset viewer.