Ticket #34045: 34041.01.patch

src/wp-admin/menu.php

@@ -102 +102 @@
         if ( 'post' === $ptype ) {
                 $menu_class .= ' open-if-no-js';
                 $ptype_file = "edit.php";
-                $post_new_file = "post-new.php";
+                $_post_new_file = "post-new.php";
                 $edit_tags_file = "edit-tags.php?taxonomy=%s";
         } else {
                 $ptype_file = "edit.php?post_type=$ptype";
-                $post_new_file = "post-new.php?post_type=$ptype";
+                $_post_new_file = "post-new.php?post_type=$ptype";
                 $edit_tags_file = "edit-tags.php?taxonomy=%s&post_type=$ptype";
         }
 
@@ -125 +125 @@
 
         $menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->labels->menu_name ), $ptype_obj->cap->edit_posts, $ptype_file, '', $menu_class, $ptype_menu_id, $menu_icon );
         $submenu[ $ptype_file ][5]  = array( $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts,  $ptype_file );
-        $submenu[ $ptype_file ][10]  = array( $ptype_obj->labels->add_new, $ptype_obj->cap->create_posts, $post_new_file );
+        $submenu[ $ptype_file ][10]  = array( $ptype_obj->labels->add_new, $ptype_obj->cap->create_posts, $_post_new_file );
 
         $i = 15;
         foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {
@@ -135 +135 @@
                 $submenu[ $ptype_file ][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, sprintf( $edit_tags_file, $tax->name ) );
         }
 }
-unset($ptype, $ptype_obj, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax);
+unset($ptype, $ptype_obj, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax, $_post_new_file);
 
 $menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' );
 

src/wp-admin/post-new.php

@@ -28 +28 @@
 if ( 'post' == $post_type ) {
         $parent_file = 'edit.php';
         $submenu_file = 'post-new.php';
+        $post_new_file = $submenu_file;
 } elseif ( 'attachment' == $post_type ) {
         if ( wp_redirect( admin_url( 'media-new.php' ) ) )
                 exit;
@@ -45 +46 @@
                                 $submenu_file = $parent_file;
                         }
                 }
+                $post_new_file = $submenu_file;
         } else {
                 $parent_file = "edit.php?post_type=$post_type";
+                $post_new_file = $parent_file;
         }
 }