Ticket #44111: 44111.diff

src/wp-admin/admin.php

@@ -168 +168 @@
 do_action( 'admin_init' );
 
 if ( isset( $plugin_page ) ) {
+        $the_parent = $pagenow;
         if ( ! empty( $typenow ) ) {
                 $the_parent = $pagenow . '?post_type=' . $typenow;
-        } else {
-                $the_parent = $pagenow;
         }
+
         if ( ! $page_hook = get_plugin_page_hook( $plugin_page, $the_parent ) ) {
                 $page_hook = get_plugin_page_hook( $plugin_page, $plugin_page );
 
                 // Back-compat for plugins using add_management_page().
                 if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook( $plugin_page, 'tools.php' ) ) {
+                        $query_string = 'page=' . $plugin_page;
                         // There could be plugin specific params on the URL, so we need the whole query string
                         if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
                                 $query_string = $_SERVER['QUERY_STRING'];
-                        } else {
-                                $query_string = 'page=' . $plugin_page;
                         }
+
                         wp_redirect( admin_url( 'tools.php?' . $query_string ) );
                         exit;
                 }