Ticket #29714: 29714-2.diff

wp-admin/includes/plugin.php

@@ -1663 +1663 @@
                 if ( !isset($_registered_pages[$hookname]) )
                         return false;
         }
-
+  $pagetest = $pagenow;
         if ( empty( $parent) ) {
-                if ( isset( $_wp_menu_nopriv[$pagenow] ) )
+                if ( $pagenow == "edit.php" && isset( $_REQUEST['post_type'] ) ) {
+                        $pagetest .= '?post_type=' . $_REQUEST['post_type' ];
+                }
+                if ( isset( $_wp_menu_nopriv[$pagetest] ) )
                         return false;
-                if ( isset( $_wp_submenu_nopriv[$pagenow][$pagenow] ) )
+                if ( isset( $_wp_submenu_nopriv[$page] ) )
                         return false;
-                if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$pagenow][$plugin_page] ) )
+                if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$page][$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][$page] ) )
                                 return false;
                         if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
                         return false;
@@ -1692 +1695 @@
                                         return true;
                                 else
                                         return false;
-                        } else if ( $submenu_array[2] == $pagenow ) {
+                        } else if ( $submenu_array[2] == $page ) {
                                 if ( current_user_can( $submenu_array[1] ))
                                         return true;
                                 else