Ticket #43848: 43848.2.diff

src/wp-admin/includes/plugin.php

@@ -1795 +1795 @@
 }
 
 /**
+ * Returns boolean on user access to admin page.
+ * In short, determines if the user can access the admin page or not.
+ *
  * @global string $pagenow
  * @global array $menu
  * @global array $submenu
@@ -1802 +1805 @@
  * @global array $_wp_submenu_nopriv
  * @global string $plugin_page
  * @global array $_registered_pages
+ *
+ * @return bool
  */
 function user_can_access_admin_page() {
         global $pagenow, $menu, $submenu, $_wp_menu_nopriv, $_wp_submenu_nopriv,
-                $plugin_page, $_registered_pages;
+                        $plugin_page, $_registered_pages;
 
         $parent = get_admin_page_parent();
 
-        if ( ! isset( $plugin_page ) && isset( $_wp_submenu_nopriv[ $parent ][ $pagenow ] ) ) {
+        if (
+                ! isset( $plugin_page )
+                && isset( $_wp_submenu_nopriv[ $parent ][ $pagenow ] )
+        ) {
                 return false;
         }
 
@@ -1826 +1834 @@
         }
 
         if ( empty( $parent ) ) {
-                if ( isset( $_wp_menu_nopriv[ $pagenow ] ) ) {
+                if (
+                        isset( $_wp_menu_nopriv[ $pagenow ] )
+                        || isset( $_wp_submenu_nopriv[ $pagenow ][ $pagenow ] )
+                        || ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[ $pagenow ][ $plugin_page ] ) )
+                        || ( isset( $plugin_page ) && isset( $_wp_menu_nopriv[ $plugin_page ] ) )
+                ) {
                         return false;
                 }
-                if ( isset( $_wp_submenu_nopriv[ $pagenow ][ $pagenow ] ) ) {
-                        return false;
-                }
-                if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[ $pagenow ][ $plugin_page ] ) ) {
-                        return false;
-                }
-                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 ] ) ) {
+                        if (
+                                isset( $_wp_submenu_nopriv[ $key ][ $pagenow ] )
+                                || ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[ $key ][ $plugin_page ] ) )
+                        ) {
                                 return false;
                         }
-                        if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[ $key ][ $plugin_page ] ) ) {
-                                return false;
-                        }
                 }
                 return true;
         }
 
-        if ( isset( $plugin_page ) && ( $plugin_page == $parent ) && isset( $_wp_menu_nopriv[ $plugin_page ] ) ) {
+        if (
+                isset( $plugin_page )
+                && ( $plugin_page === $parent )
+                && isset( $_wp_menu_nopriv[ $plugin_page ] )
+        ) {
                 return false;
         }
 
         if ( isset( $submenu[ $parent ] ) ) {
                 foreach ( $submenu[ $parent ] as $submenu_array ) {
-                        if ( isset( $plugin_page ) && ( $submenu_array[2] == $plugin_page ) ) {
+                        if (
+                                ( isset( $plugin_page ) && ( $submenu_array[2] === $plugin_page ) )
+                                || $submenu_array[2] === $pagenow
+                        ) {
                                 if ( current_user_can( $submenu_array[1] ) ) {
                                         return true;
-                                } else {
-                                        return false;
                                 }
-                        } elseif ( $submenu_array[2] == $pagenow ) {
-                                if ( current_user_can( $submenu_array[1] ) ) {
-                                        return true;
-                                } else {
-                                        return false;
-                                }
+
+                                return false;
                         }
                 }
         }
 
         foreach ( $menu as $menu_array ) {
-                if ( $menu_array[2] == $parent ) {
-                        if ( current_user_can( $menu_array[1] ) ) {
-                                return true;
-                        } else {
-                                return false;
-                        }
+                if (
+                        $menu_array[2] === $parent
+                        && current_user_can( $menu_array[1] )
+                ) {
+                        return true;
                 }
+
+                return false;
         }
 
         return true;