From d91c273679218269e1c318cc11eaab293ab37f2a Mon Sep 17 00:00:00 2001 From: jrfnl Date: Thu, 11 Jul 2019 11:10:55 +0200 Subject: [PATCH] Simplify & modernize current_user_can_for_blog() --- src/wp-includes/capabilities.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/wp-includes/capabilities.php b/src/wp-includes/capabilities.php index c9c91848c2..44f3debf20 100644 --- a/src/wp-includes/capabilities.php +++ b/src/wp-includes/capabilities.php @@ -678,7 +678,7 @@ function current_user_can( $capability, ...$args ) { * @param mixed ...$args Optional further parameters, typically starting with an object ID. * @return bool Whether the user has the given capability. */ -function current_user_can_for_blog( $blog_id, $capability ) { +function current_user_can_for_blog( $blog_id, $capability, ...$args ) { $switched = is_multisite() ? switch_to_blog( $blog_id ) : false; $current_user = wp_get_current_user(); @@ -690,10 +690,7 @@ function current_user_can_for_blog( $blog_id, $capability ) { return false; } - $args = array_slice( func_get_args(), 2 ); - $args = array_merge( array( $capability ), $args ); - - $can = call_user_func_array( array( $current_user, 'has_cap' ), $args ); + $can = $current_user->has_cap( $capability, ...$args ); if ( $switched ) { restore_current_blog(); -- 2.21.0.windows.1