Ticket #14060: 14060.3.diff

src/wp-admin/includes/menu.php

@@ -330 +330 @@
         unset( $menu[ $last_menu_key ] );
 unset( $last_menu_key );
 
-if ( !user_can_access_admin_page() ) {
+if ( ! admin_page_exists() ) { 
+
+        /**
+         * Fires when access to an admin page does not exist.
+         *
+         * @since 4.6.0
+         */
+        do_action( 'admin_page_not_found' ); 
+
+        wp_die( __( 'The requested page does not exist.' ), 403 ); 
+} elseif ( ! user_can_access_admin_page() ) {
 
         /**
          * Fires when access to an admin page is denied.

src/wp-admin/includes/plugin.php

@@ -1674 +1674 @@
 }
 
 /**
+ * @since 4.6.0
+ * 
+ * @global $admin_page_parent
+ * @global string $plugin_page
+ * @global array $_registered_pages
+ */
+function admin_page_exists() {
+        global $admin_page_parent, $plugin_page, $_registered_pages;
+
+        if ( ! isset( $admin_page_parent ) ) {
+                $admin_page_parent = get_admin_page_parent(); 
+        }
+
+        if ( isset( $plugin_page ) ) { 
+                $hookname = get_plugin_page_hookname( $plugin_page, $admin_page_parent ); 
+
+                if ( ! isset($_registered_pages[$hookname]) ) {
+                        return false; 
+                }
+        } 
+
+        return true; 
+}
+
+/**
  *
  * @global string $pagenow
  * @global array $menu
@@ -1685 +1710 @@
  */
 function user_can_access_admin_page() {
         global $pagenow, $menu, $submenu, $_wp_menu_nopriv, $_wp_submenu_nopriv,
-                $plugin_page, $_registered_pages;
+                $plugin_page, $_registered_pages, $admin_page_parent; ;
 
-        $parent = get_admin_page_parent();
+        $parent = isset( $admin_page_parent ) ? $admin_page_parent : get_admin_page_parent();
 
         if ( !isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$pagenow] ) )
                 return false;
@@ -1698 +1723 @@
 
                 $hookname = get_plugin_page_hookname($plugin_page, $parent);
 
-                if ( !isset($_registered_pages[$hookname]) )
+                if ( !admin_page_exists() ) {
                         return false;
+                }
         }
 
         if ( empty( $parent) ) {