Skip to:
Content

bbPress.org

Changeset 6119


Ignore:
Timestamp:
11/09/2016 10:51:17 PM (8 years ago)
Author:
johnjamesjacoby
Message:

Theme Compat: Support WP_Hook class in 2.5 branch.

See #2871, r5945.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.5/includes/core/template-functions.php

    r5814 r6119  
    309309    $args = $stack = array();
    310310
    311     // Add 'bbp_template_stack' to the current filter array
     311    // Add 'bp_template_stack' to the current filter array.
    312312    $wp_current_filter[] = $tag;
    313313
    314     // Sort
    315     if ( ! isset( $merged_filters[ $tag ] ) ) {
    316         ksort( $wp_filter[$tag] );
    317         $merged_filters[ $tag ] = true;
    318     }
    319 
    320     // Ensure we're always at the beginning of the filter array
    321     reset( $wp_filter[ $tag ] );
    322 
    323     // Loop through 'bbp_template_stack' filters, and call callback functions
     314    // Sort.
     315    if ( class_exists( 'WP_Hook' ) ) {
     316        $filter = $wp_filter[ $tag ]->callbacks;
     317    } else {
     318        $filter = &$wp_filter[ $tag ];
     319
     320        if ( ! isset( $merged_filters[ $tag ] ) ) {
     321            ksort( $filter );
     322            $merged_filters[ $tag ] = true;
     323        }
     324    }
     325
     326    // Ensure we're always at the beginning of the filter array.
     327    reset( $filter );
     328
     329    // Loop through 'bp_template_stack' filters, and call callback functions.
    324330    do {
    325         foreach ( (array) current( $wp_filter[$tag] ) as $the_ ) {
     331        foreach( (array) current( $filter ) as $the_ ) {
    326332            if ( ! is_null( $the_['function'] ) ) {
    327333                $args[1] = $stack;
     
    329335            }
    330336        }
    331     } while ( next( $wp_filter[$tag] ) !== false );
    332 
    333     // Remove 'bbp_template_stack' from the current filter array
     337    } while ( next( $filter ) !== false );
     338
     339    // Remove 'bp_template_stack' from the current filter array.
    334340    array_pop( $wp_current_filter );
    335341
    336     // Remove empties and duplicates
     342    // Remove empties and duplicates.
    337343    $stack = array_unique( array_filter( $stack ) );
    338344
Note: See TracChangeset for help on using the changeset viewer.