From 7137daec42dcd760509b0627a5aafa9c97f47100 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Tue, 13 Oct 2020 19:59:08 +0000
Subject: [PATCH] Administration: Restore alternative admin menu position for
 menu items with the same position value as an existing menu item.

Reverts parts of [49108].

Props johnjamesjacoby.
Fixes #42918.
Built from https://develop.svn.wordpress.org/trunk@49138


git-svn-id: http://core.svn.wordpress.org/trunk@48900 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/plugin.php | 7 +++----
 wp-includes/version.php      | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 29ecc3b402..ec791a3782 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -1347,11 +1347,10 @@ function add_menu_page( $page_title, $menu_title, $capability, $menu_slug, $func
 
 	if ( null === $position ) {
 		$menu[] = $new_menu;
+	} elseif ( isset( $menu[ "$position" ] ) ) {
+		$position            = $position + substr( base_convert( md5( $menu_slug . $menu_title ), 16, 10 ), -5 ) * 0.00001;
+		$menu[ "$position" ] = $new_menu;
 	} else {
-		if ( isset( $menu[ $position ] ) ) {
-			$position = $position + substr( base_convert( md5( $menu_slug . $menu_title ), 16, 10 ), -5 ) * 0.00001;
-		}
-
 		$menu[ $position ] = $new_menu;
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e4dc78d2ec..06a987505d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-alpha-49137';
+$wp_version = '5.6-alpha-49138';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.