Changeset 48762

Timestamp:

08/08/2020 08:22:34 PM (6 years ago)

Author:

SergeyBiryukov

Message:

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

Props rnaby, valentinbora, khag7.
Fixes #43848.

File:

• trunk/src/wp-admin/includes/plugin.php (modified) (4 diffs)

trunk/src/wp-admin/includes/plugin.php

@@ -2114 +2114 @@
                         return false;
                 }
+
                 foreach ( array_keys( $_wp_submenu_nopriv ) as $key ) {
                         if ( isset( $_wp_submenu_nopriv[ $key ][ $pagenow ] ) ) {
@@ -2122 +2123 @@
                         }
                 }
+
                 return true;
         }
@@ -2132 +2134 @@
                 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] );
                         }
                 }
@@ -2149 +2143 @@
         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] );
                 }
         }