Changeset 6119

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:

• branches/2.5/includes/core/template-functions.php (modified) (2 diffs)

branches/2.5/includes/core/template-functions.php

@@ -309 +309 @@
     $args = $stack = array();
 
-    // Add 'bbp_template_stack' to the current filter array
+    // Add 'bp_template_stack' to the current filter array.
     $wp_current_filter[] = $tag;
 
-    // Sort
-    if ( ! isset( $merged_filters[ $tag ] ) ) {
-        ksort( $wp_filter[$tag] );
-        $merged_filters[ $tag ] = true;
-    }
-
-    // Ensure we're always at the beginning of the filter array
-    reset( $wp_filter[ $tag ] );
-
-    // Loop through 'bbp_template_stack' filters, and call callback functions
+    // Sort.
+    if ( class_exists( 'WP_Hook' ) ) {
+        $filter = $wp_filter[ $tag ]->callbacks;
+    } else {
+        $filter = &$wp_filter[ $tag ];
+
+        if ( ! isset( $merged_filters[ $tag ] ) ) {
+            ksort( $filter );
+            $merged_filters[ $tag ] = true;
+        }
+    }
+
+    // Ensure we're always at the beginning of the filter array.
+    reset( $filter );
+
+    // Loop through 'bp_template_stack' filters, and call callback functions.
     do {
-        foreach ( (array) current( $wp_filter[$tag] ) as $the_ ) {
+        foreach( (array) current( $filter ) as $the_ ) {
             if ( ! is_null( $the_['function'] ) ) {
                 $args[1] = $stack;
@@ -329 +335 @@
             }
         }
-    } while ( next( $wp_filter[$tag] ) !== false );
-
-    // Remove 'bbp_template_stack' from the current filter array
+    } while ( next( $filter ) !== false );
+
+    // Remove 'bp_template_stack' from the current filter array.
     array_pop( $wp_current_filter );
 
-    // Remove empties and duplicates
+    // Remove empties and duplicates.
     $stack = array_unique( array_filter( $stack ) );