Changeset 5944

Timestamp:

10/27/2015 09:49:24 AM (9 years ago)

Author:

netweb

Message:

Core: Support for WP_Hook in bbp_get_template_stack()

The proposed WP_Hook ​#WP17817 breaks backward compatibility for plugins that
attempt to manipulate $wp_filter in certain ways. For bbPress, it means
that we cannot directly modify the callbacks that are currently registered as
an array at $wp_filter[ $tag ], in bbp_get_template_stack(). Instead, when
WP_Hook is not available, we assign the callbacks to a variable (leveraging
WP_Hook's ArrayAccess) and manipulate the variable.

Props jbrinley. Fixes #2871

File:

• trunk/src/includes/core/template-functions.php (modified) (2 diffs)

trunk/src/includes/core/template-functions.php

@@ -315 +315 @@
     $wp_current_filter[] = $tag;
 
-    // Bail if no stack setup
-    if ( empty( $wp_filter[ $tag ] ) ) {
-        return array();
-    }
-
-    // Sort
-    if ( ! isset( $merged_filters[ $tag ] ) ) {
-        ksort( $wp_filter[ $tag ] );
-        $merged_filters[ $tag ] = true;
+    if ( class_exists( 'WP_Hook' ) ) {
+        $filter = $wp_filter[ $tag ]->callbacks;
+    } else {
+        $filter = &$wp_filter[ $tag ];
+
+        // Sort
+        if ( ! isset( $merged_filters[ $tag ] ) ) {
+            ksort( $filter );
+            $merged_filters[ $tag ] = true;
+        }
     }
 
     // Ensure we're always at the beginning of the filter array
-    reset( $wp_filter[ $tag ] );
+    reset( $filter );
 
     // Loop through 'bbp_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;
@@ -337 +338 @@
             }
         }
-    } while ( next( $wp_filter[ $tag ] ) !== false );
+    } while ( next( $filter ) !== false );
 
     // Remove 'bbp_template_stack' from the current filter array