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

Timestamp:

04/23/2018 07:35:53 AM (8 years ago)

Author:

johnjamesjacoby

Message:

Intercept: return default value if an invalid number of args is parsed.

Also pass a $user_id into favorites & subscriptions links functions.

These changes together will prevent notices & errors in certain intercept conditions.

File:

• trunk/src/includes/core/abstraction.php (modified) (2 diffs)

trunk/src/includes/core/abstraction.php

@@ -434 +434 @@
 
     // Backwards compatibility juggle
-    $hook     = ( false === strpos( $action, 'pre_' ) )
+    $hook = ( false === strpos( $action, 'pre_' ) )
         ? "pre_{$action}"
         : $action;
 
+    // Default value
+    $default = bbp_default_intercept();
+
     // Parse args
-    $r        = bbp_parse_args( (array) $args, array(), 'maybe_intercept' );
-    $retval   = reset( $r );
+    $r = bbp_parse_args( (array) $args, array(), 'maybe_intercept' );
+
+    // Bail if no args
+    if ( empty( $r ) ) {
+        return $default;
+    }
 
     // Filter
@@ -447 +454 @@
 
     // Return filtered value, or default if not intercepted
-    return ( $filtered === $retval )
-        ? bbp_default_intercept()
+    return ( $filtered === reset( $r ) )
+        ? $default
         : $filtered;
 }