WordPress-C/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-22 14:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Coding Standards: Simplify some parts of user_can_access_admin_page() for better readability.

Browse Source 
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
This commit is contained in:
Sergey Biryukov 2020-08-08 20:24:05 +00:00
parent 1e5b6101e7
commit f5a4ac614e
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-admin/includes/plugin.php
View File

@ -2113,6 +2113,7 @@ function user_can_access_admin_page() {
if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[ $plugin_page ] ) ) { if ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[ $plugin_page ] ) ) {
return false; return false;
} }
foreach ( array_keys( $_wp_submenu_nopriv ) as $key ) { foreach ( array_keys( $_wp_submenu_nopriv ) as $key ) {
if ( isset( $_wp_submenu_nopriv[ $key ][ $pagenow ] ) ) { if ( isset( $_wp_submenu_nopriv[ $key ][ $pagenow ] ) ) {
return false; return false;
@ -2121,6 +2122,7 @@ function user_can_access_admin_page() {
return false; return false;
} }
} }
return true; return true;
} }
@ -2131,28 +2133,16 @@ function user_can_access_admin_page() {
if ( isset( $submenu[ $parent ] ) ) { if ( isset( $submenu[ $parent ] ) ) {
foreach ( $submenu[ $parent ] as $submenu_array ) { foreach ( $submenu[ $parent ] as $submenu_array ) {
if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) { if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {
if ( current_user_can( $submenu_array[1] ) ) { return current_user_can( $submenu_array[1] );
return true;
} else {
return false;
}
} elseif ( $submenu_array[2] == $pagenow ) { } elseif ( $submenu_array[2] == $pagenow ) {
if ( current_user_can( $submenu_array[1] ) ) { return current_user_can( $submenu_array[1] );
return true;
} else {
return false;
}
} }
} }
} }
foreach ( $menu as $menu_array ) { foreach ( $menu as $menu_array ) {
if ( $menu_array[2] == $parent ) { if ( $menu_array[2] == $parent ) {
if ( current_user_can( $menu_array[1] ) ) { return current_user_can( $menu_array[1] );
return true;
} else {
return false;
}
} }
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.