Ticket #31178: menu.php.patch

src/wp-admin/menu.php

@@ -22 +22 @@
  * @var array
  */
 
-$menu[2] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' );
 
+function get_safe_index( $target_index, $target_array ){
+        if( ! array_key_exists( $target_index, $target_array ) ){
+                return $target_index;
+        }
+        while( array_key_exists( $target_index, $target_array ) ){
+                $target_index = $target_index . '.' . rand( 1, 1000 );
+        }
+        return $target_index;
+}
+
+
+$menu[ get_safe_index( 2, $menu ) ] = array( __('Dashboard'), 'read', 'index.php', '', 'menu-top menu-top-first menu-icon-dashboard', 'menu-dashboard', 'dashicons-dashboard' );
+
 $submenu[ 'index.php' ][0] = array( __('Home'), 'read', 'index.php' );
 
 if ( is_multisite() ) {
@@ -126 +138 @@
          * by a hard-coded value below, increment the position.
          */
         $core_menu_positions = array(59, 60, 65, 70, 75, 80, 85, 99);
-        while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) )
+        while ( isset( $menu[$ptype_menu_position] ) || in_array( $ptype_menu_position, $core_menu_positions ) ){
                 $ptype_menu_position++;
+        }
 
-        $menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-' . $ptype_class, 'menu-posts-' . $ptype_for_id, $menu_icon );
+
+        $menu[get_safe_index( $ptype_menu_position, $menu )] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-' . $ptype_class, 'menu-posts-' . $ptype_for_id, $menu_icon );
         $submenu["edit.php?post_type=$ptype"][5]  = array( $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts,  "edit.php?post_type=$ptype");
         $submenu["edit.php?post_type=$ptype"][10]  = array( $ptype_obj->labels->add_new, $ptype_obj->cap->create_posts, "post-new.php?post_type=$ptype" );