Changeset 14049

Timestamp:

04/10/2010 10:48:30 AM (15 years ago)

Author:

dd32

Message:

Prevent $post_type_object->menu_position from conflicting with another plugin, or core menu item. Props blepoxp. Fixes #12951

File:

• trunk/wp-admin/menu.php (modified) (2 diffs)

trunk/wp-admin/menu.php

@@ -115 +115 @@
 
 foreach ( (array) get_post_types( array('show_ui' => true) ) as $ptype ) {
-    $_wp_last_object_menu++;
     $ptype_obj = get_post_type_object($ptype);
-    $ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : $_wp_last_object_menu;
+    $ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first.
     $menu_icon = is_string($ptype_obj->menu_icon) ? esc_url($ptype_obj->menu_icon) : 'div';
-    
+
+    // if $ptype_menu_position is already populated or will be populated 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) )
+        $ptype_menu_position++;
+
     $menu[$ptype_menu_position] = array(esc_attr($ptype_obj->label), $ptype_obj->edit_type_cap, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-posts', 'menu-' . sanitize_html_class($ptype), $menu_icon);
     $submenu["edit.php?post_type=$ptype"][5]  = array( __('Edit'), $ptype_obj->edit_type_cap,  "edit.php?post_type=$ptype");
@@ -412 +416 @@
 $menu = add_menu_classes($menu);
 
-if (! user_can_access_admin_page()) {
+if ( !user_can_access_admin_page() ) {
     do_action('admin_page_access_denied');
     wp_die( __('You do not have sufficient permissions to access this page.') );