Changeset 33723

Timestamp:

08/24/2015 09:18:20 PM (11 years ago)

Author:

wonderboymusic

Message:

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.

Location:

trunk/src

Files:

• wp-admin/menu.php (modified) (6 diffs)
• wp-includes/post.php (modified) (2 diffs)

trunk/src/wp-admin/menu.php

@@ -45 +45 @@
 $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' );
@@ -77 +65 @@
         $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();
@@ -99 +76 @@
 $_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.
@@ -114 +93 @@
                         $menu_icon = esc_url( $ptype_obj->menu_icon );
                 }
-                $ptype_class = $ptype_for_id;
+        } 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 {
-                $menu_icon   = 'dashicons-admin-post';
-                $ptype_class = 'post';
-        }
-
+                $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
@@ -128 +123 @@
                 $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;
@@ -137 +132 @@
                         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" );
-        }
-}
-unset($ptype, $ptype_obj, $ptype_class, $ptype_for_id, $ptype_menu_position, $menu_icon, $i, $tax);
+                $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);
 
 $menu[59] = array( '', 'read', 'separator2', '', 'wp-menu-separator' );

trunk/src/wp-includes/post.php

@@ -27 +27 @@
                 'capability_type' => 'post',
                 'map_meta_cap' => true,
+                'menu_position' => 5,
                 'hierarchical' => false,
                 'rewrite' => false,
@@ -44 +45 @@
                 'capability_type' => 'page',
                 'map_meta_cap' => true,
+                'menu_position' => 20,
                 'hierarchical' => true,
                 'rewrite' => false,