From f5a4ac614e4d5712a4d2a94591ca449e1cdf02e6 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 8 Aug 2020 20:24:05 +0000
Subject: [PATCH] Coding Standards: Simplify some parts of
 `user_can_access_admin_page()` for better readability.

Props rnaby, valentinbora, khag7.
Fixes #43848.
Built from https://develop.svn.wordpress.org/trunk@48762


git-svn-id: http://core.svn.wordpress.org/trunk@48524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/plugin.php | 20 +++++---------------
 wp-includes/version.php      |  2 +-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index c217907436..07c9304a71 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -2113,6 +2113,7 @@ function user_can_access_admin_page() {
 		if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[ $plugin_page ] ) ) {
 			return false;
 		}
+
 		foreach ( array_keys( $_wp_submenu_nopriv ) as $key ) {
 			if ( isset( $_wp_submenu_nopriv[ $key ][ $pagenow ] ) ) {
 				return false;
@@ -2121,6 +2122,7 @@ function user_can_access_admin_page() {
 				return false;
 			}
 		}
+
 		return true;
 	}
 
@@ -2131,28 +2133,16 @@ function user_can_access_admin_page() {
 	if ( isset( $submenu[ $parent ] ) ) {
 		foreach ( $submenu[ $parent ] as $submenu_array ) {
 			if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {
-				if ( current_user_can( $submenu_array[1] ) ) {
-					return true;
-				} else {
-					return false;
-				}
+				return current_user_can( $submenu_array[1] );
 			} elseif ( $submenu_array[2] == $pagenow ) {
-				if ( current_user_can( $submenu_array[1] ) ) {
-					return true;
-				} else {
-					return false;
-				}
+				return current_user_can( $submenu_array[1] );
 			}
 		}
 	}
 
 	foreach ( $menu as $menu_array ) {
 		if ( $menu_array[2] == $parent ) {
-			if ( current_user_can( $menu_array[1] ) ) {
-				return true;
-			} else {
-				return false;
-			}
+			return current_user_can( $menu_array[1] );
 		}
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 944e6f5ce9..5407857076 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-alpha-48761';
+$wp_version = '5.6-alpha-48762';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.