Changeset 6803 for trunk/src/includes/core/abstraction.php

Timestamp:

04/22/2018 10:34:54 PM (7 years ago)

Author:

johnjamesjacoby

Message:

Intercept: updates to bbp_maybe_intercept():

• Use bbp_parse_args() internally
• Compare against known default return value
• Use call_user_func_array() to avoid using extract()

This change allows the intercept API to work a bit more smoothly with filters that have multiple arguments passed into them. Previous to this, those filters may have dropped their arguments, or otherwise not passed the proper arguments into their filter call.

This fixes a regression related to BuddyPress profile URL overrides.

See #3814.

File:

• trunk/src/includes/core/abstraction.php (modified) (1 diff)

trunk/src/includes/core/abstraction.php

@@ -434 +434 @@
 
     // Backwards compatibility juggle
-    $hook      = ( false === strpos( $action, 'pre_' ) )
+    $hook     = ( false === strpos( $action, 'pre_' ) )
         ? "pre_{$action}"
         : $action;
 
-    // Sanitize the hook same
-    $key       = sanitize_key( $hook );
-
-    // Default return value
-    $default   = bbp_default_intercept();
-
-    // Filter and return
-    return apply_filters( $key, $default, extract( (array) $args ) );
+    // Parse args
+    $r        = bbp_parse_args( (array) $args, array(), 'maybe_intercept' );
+    $retval   = reset( $r );
+
+    // Filter
+    $args     = array_merge( array( $hook ), $r );
+    $filtered = call_user_func_array( 'apply_filters', $args );
+
+    // Return filtered value, or default if not intercepted
+    return ( $filtered === $retval )
+        ? bbp_default_intercept()
+        : $filtered;
 }