Simplify the logic per suggestion from @jonnynews

rinatkhaziev · jonnynews · web-flow · commit 36ff6f1fc913 · 2025-10-20T15:31:23.000-05:00
Co-authored-by: Jonny Harris &lt;148061917+jonnynews@users.noreply.github.com&gt;
diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
@@ -1181,10 +1181,11 @@ function is_user_member_of_blog( $user_id = 0, $blog_id = 0 ) {
 
 
 	if ( 1 === $blog_id ) {
-		$has_cap = get_user_meta( $user_id, $base_capabilities_key, true );
+		$capabilities_key = $wpdb->base_prefix . 'capabilities';
 	} else {
-		$has_cap = get_user_meta( $user_id, $site_capabilities_key, true );
+		$capabilities_key = $wpdb->base_prefix . $blog_id . '_capabilities';
 	}
+	$has_cap = get_user_meta( $user_id, $capabilities_key, true );
 
 	return is_array( $has_cap );
 }

Original file line number	Diff line number	Diff line change
`@@ -1181,10 +1181,11 @@ function is_user_member_of_blog( $user_id = 0, $blog_id = 0 ) {`
`1181`	`1181`
`1182`	`1182`
`1183`	`1183`	`if ( 1 === $blog_id ) {`
`1184`		`- $has_cap = get_user_meta( $user_id, $base_capabilities_key, true );`
	`1184`	`+ $capabilities_key = $wpdb->base_prefix . 'capabilities';`
`1185`	`1185`	`} else {`
`1186`		`- $has_cap = get_user_meta( $user_id, $site_capabilities_key, true );`
	`1186`	`+ $capabilities_key = $wpdb->base_prefix . $blog_id . '_capabilities';`
`1187`	`1187`	`}`
	`1188`	`+ $has_cap = get_user_meta( $user_id, $capabilities_key, true );`
`1188`	`1189`
`1189`	`1190`	`return is_array( $has_cap );`
`1190`	`1191`	`}`