From 21c61251a28cb0fb0723f8614280288a9361804f Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Mon, 24 Aug 2015 21:19:24 +0000 Subject: [PATCH] With a few modifications in `wp-admin/menu.php`, we can eliminate the extra logic for Post and Page menu registration. Instead, they can just declare `menu_position` on post type registration. Props scribu, wonderboymusic. Fixes #16865. Built from https://develop.svn.wordpress.org/trunk@33723 git-svn-id: http://core.svn.wordpress.org/trunk@33690 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/menu.php | 65 +++++++++++++++++++---------------------- wp-includes/post.php | 2 ++ wp-includes/version.php | 2 +- 3 files changed, 33 insertions(+), 36 deletions(-) diff --git a/wp-admin/menu.php b/wp-admin/menu.php index 17096a97a8..f5252c448a 100644 --- a/wp-admin/menu.php +++ b/wp-admin/menu.php @@ -44,19 +44,7 @@ if ( ! is_multisite() ) { $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' ); -$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'dashicons-admin-post' ); - $submenu['edit.php'][5] = array( __('All Posts'), 'edit_posts', 'edit.php' ); - /* translators: add new post */ - $submenu['edit.php'][10] = array( _x('Add New', 'post'), get_post_type_object( 'post' )->cap->create_posts, 'post-new.php' ); - - $i = 15; - foreach ( get_taxonomies( array(), 'objects' ) as $tax ) { - if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array('post', (array) $tax->object_type, true) ) - continue; - - $submenu['edit.php'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name ); - } - unset($tax); +// $menu[5] = Posts $menu[10] = array( __('Media'), 'upload_files', 'upload.php', '', 'menu-top menu-icon-media', 'menu-media', 'dashicons-admin-media' ); $submenu['upload.php'][5] = array( __('Library'), 'upload_files', 'upload.php'); @@ -76,18 +64,7 @@ $menu[15] = array( __('Links'), 'manage_links', 'link-manager.php', '', 'menu-to $submenu['link-manager.php'][10] = array( _x('Add New', 'link'), 'manage_links', 'link-add.php' ); $submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-tags.php?taxonomy=link_category' ); -$menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'dashicons-admin-page' ); - $submenu['edit.php?post_type=page'][5] = array( __('All Pages'), 'edit_pages', 'edit.php?post_type=page' ); - /* translators: add new page */ - $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), get_post_type_object( 'page' )->cap->create_posts, 'post-new.php?post_type=page' ); - $i = 15; - foreach ( get_taxonomies( array(), 'objects' ) as $tax ) { - if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array('page', (array) $tax->object_type, true) ) - continue; - - $submenu['edit.php?post_type=page'][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, 'edit-tags.php?taxonomy=' . $tax->name . '&post_type=page' ); - } - unset($tax); +// $menu[20] = Pages $awaiting_mod = wp_count_comments(); $awaiting_mod = $awaiting_mod->moderated; @@ -98,7 +75,9 @@ $submenu[ 'edit-comments.php' ][0] = array( __('All Comments'), 'edit_posts', 'e $_wp_last_object_menu = 25; // The index of the last top-level menu in the object menu group -foreach ( (array) get_post_types( array('show_ui' => true, '_builtin' => false, 'show_in_menu' => true ) ) as $ptype ) { +$types = (array) get_post_types( array('show_ui' => true, '_builtin' => false, 'show_in_menu' => true ) ); +$builtin = array( 'post', 'page' ); +foreach ( array_merge( $builtin, $types ) as $ptype ) { $ptype_obj = get_post_type_object( $ptype ); // Check if it should be a submenu. if ( $ptype_obj->show_in_menu !== true ) @@ -113,12 +92,28 @@ foreach ( (array) get_post_types( array('show_ui' => true, '_builtin' => false, } else { $menu_icon = esc_url( $ptype_obj->menu_icon ); } - $ptype_class = $ptype_for_id; - } else { - $menu_icon = 'dashicons-admin-post'; - $ptype_class = 'post'; + } elseif ( in_array( $ptype, $builtin ) ) { + $menu_icon = 'dashicons-admin-' . $ptype; } + $menu_class = 'menu-top menu-icon-' . $ptype_for_id; + // 'post' special case + if ( 'post' === $ptype ) { + $menu_class .= ' open-if-no-js'; + $ptype_file = "edit.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"; + $edit_tags_file = "edit-tags.php?taxonomy=%s&post_type=$ptype"; + } + + if ( in_array( $ptype, $builtin ) ) { + $ptype_menu_id = 'menu-' . $ptype_for_id . 's'; + } else { + $ptype_menu_id = 'menu-posts-' . $ptype_for_id; + } /* * If $ptype_menu_position is already populated or will be populated * by a hard-coded value below, increment the position. @@ -127,19 +122,19 @@ foreach ( (array) get_post_types( array('show_ui' => true, '_builtin' => false, 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 ); - $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" ); + $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 ); $i = 15; foreach ( get_taxonomies( array(), 'objects' ) as $tax ) { if ( ! $tax->show_ui || ! $tax->show_in_menu || ! in_array($ptype, (array) $tax->object_type, true) ) continue; - $submenu["edit.php?post_type=$ptype"][$i++] = array( esc_attr( $tax->labels->menu_name ), $tax->cap->manage_terms, "edit-tags.php?taxonomy=$tax->name&post_type=$ptype" ); + $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_class, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax); +unset($ptype, $ptype_obj, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax); $menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' ); diff --git a/wp-includes/post.php b/wp-includes/post.php index 0cb1169a6c..dbf225d8d5 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -26,6 +26,7 @@ function create_initial_post_types() { '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */ 'capability_type' => 'post', 'map_meta_cap' => true, + 'menu_position' => 5, 'hierarchical' => false, 'rewrite' => false, 'query_var' => false, @@ -43,6 +44,7 @@ function create_initial_post_types() { '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */ 'capability_type' => 'page', 'map_meta_cap' => true, + 'menu_position' => 20, 'hierarchical' => true, 'rewrite' => false, 'query_var' => false, diff --git a/wp-includes/version.php b/wp-includes/version.php index 39f51ef11f..96b3f388b5 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-33722'; +$wp_version = '4.4-alpha-33723'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.