From ea0369944f6d23d084e5d3f11195f5db66efebd6 Mon Sep 17 00:00:00 2001 From: jrfnl Date: Thu, 11 Jul 2019 11:17:47 +0200 Subject: [PATCH] Simplify & modernize user_can() --- 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 6c8f76906b..e2d132d217 100644 --- a/src/wp-includes/capabilities.php +++ b/src/wp-includes/capabilities.php @@ -754,7 +754,7 @@ function author_can( $post, $capability, ...$args ) { * @param mixed ...$args Optional further parameters, typically starting with an object ID. * @return bool Whether the user has the given capability. */ -function user_can( $user, $capability ) { +function user_can( $user, $capability, ...$args ) { if ( ! is_object( $user ) ) { $user = get_userdata( $user ); } @@ -763,10 +763,7 @@ function user_can( $user, $capability ) { return false; } - $args = array_slice( func_get_args(), 2 ); - $args = array_merge( array( $capability ), $args ); - - return call_user_func_array( array( $user, 'has_cap' ), $args ); + return $user->has_cap( $capability, ...$args ); } /** -- 2.21.0.windows.1