Ticket #14060: 14060.2.patch

wp-admin/includes/menu.php

@@ -220 +220 @@
         unset( $menu[ $last_menu_key ] );
 unset( $last_menu_key );
 
-if ( !user_can_access_admin_page() ) {
+if ( !admin_page_exists() ) {
+        do_action('admin_page_not_found');
+        wp_die( __('The requested page does not exist.') );
+} elseif ( !user_can_access_admin_page() ) {
         do_action('admin_page_access_denied');
         wp_die( __('You do not have sufficient permissions to access this page.') );
 }

wp-admin/includes/plugin.php

@@ -1509 +1509 @@
         return $page_type . '_page_' . $plugin_name;
 }
 
+function admin_page_exists() {
+        global $admin_page_parent;
+        global $plugin_page;
+        global $_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;
+}
+
 function user_can_access_admin_page() {
         global $pagenow;
         global $menu;
         global $submenu;
+        global $admin_page_parent;
         global $_wp_menu_nopriv;
         global $_wp_submenu_nopriv;
         global $plugin_page;
         global $_registered_pages;
 
-        $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;
@@ -1527 +1546 @@
                 if ( isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
                         return false;
 
-                $hookname = get_plugin_page_hookname($plugin_page, $parent);
-
-                if ( !isset($_registered_pages[$hookname]) )
+                if ( !admin_page_exists() )
                         return false;
         }