Ticket #19085: 19085.patch

wp-admin/menu-header.php

@@ -111 +111 @@
 
                         $first = true;
                         foreach ( $submenu_items as $sub_key => $sub_item ) {
+                                //check if is hidden
+                                if (isset($sub_item[99]) && 'hide' === $sub_item[99] && $first)
+                                        continue;
+
                                 if ( ! current_user_can( $sub_item[1] ) )
                                         continue;
 

wp-admin/includes/plugin.php

@@ -1387 +1387 @@
         if ( !isset( $submenu[$menu_slug] ) )
                 return false;
 
+        $first = true;
         foreach ( $submenu[$menu_slug] as $i => $item ) {
                 if ( $submenu_slug == $item[2] ) {
+                        //check if to be removed submenu page is first item
+                        if ($first) {
+                                //add hide flag
+                                $submenu[$menu_slug][$i][99] = 'hide';
+                                return item;
+                        }
                         unset( $submenu[$menu_slug][$i] );
                         return $item;
                 }
+                $first = false;
         }
 
         return false;