Changeset 46869 for branches/5.3/src/wp-admin/includes/plugin.php

Timestamp:

12/09/2019 09:04:07 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Menus: Avoid a PHP warning in add_submenu_page() when the same value is passed for both $parent_slug and $menu_slug parameters.

Props welcher, ispreview, ayeshrajans, NextScripts, adamsilverstein, garrett-eclipse, 123host.
Merges [46868] to the 5.3 branch.
Fixes #48599.

Location:

branches/5.3

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/plugin.php (modified) (1 diff)

branches/5.3/src/wp-admin/includes/plugin.php

@@ -1389 +1389 @@
         $submenu[ $parent_slug ][] = $new_sub_menu;
     } else {
-        // If position is equal or higher than the number of items in the array, append the submenu.
-        if ( $position >= count( $submenu[ $parent_slug ] ) ) {
+        // Append the submenu if the parent item is not present in the submenu,
+        // or if position is equal or higher than the number of items in the array.
+        if ( ! isset( $submenu[ $parent_slug ] ) || $position >= count( $submenu[ $parent_slug ] ) ) {
             $submenu[ $parent_slug ][] = $new_sub_menu;
         } else {