Ticket #6501: 6501.01.patch

src/bp-core/bp-core-caps.php

@@ -268 +268 @@
 function bp_current_user_can( $capability, $blog_id = 0 ) {
 
         // Use root blog if no ID passed
-        if ( empty( $blog_id ) )
+        if ( empty( $blog_id ) ) {
                 $blog_id = bp_get_root_blog_id();
+        }
+
+        $_args = array_slice( func_get_args(), 2 );
+        $args  = array_merge( array( $blog_id, $capability ), $_args );
 
-        $retval = current_user_can_for_blog( $blog_id, $capability );
+        $retval = call_user_func_array( 'current_user_can_for_blog', $args );
 
         /**
          * Filters whether or not the current user has a given capability.
@@ -281 +285 @@
          * @param bool   $retval     Whether or not the current user has the capability.
          * @param string $capability The capability being checked for.
          * @param int    $blog_id    Blog ID. Defaults to the BP root blog.
+         * @param array  $_args      Array of extra arguments passed.
          */
-        return (bool) apply_filters( 'bp_current_user_can', $retval, $capability, $blog_id );
+        return (bool) apply_filters( 'bp_current_user_can', $retval, $capability, $blog_id, $_args );
 }
 
 /**