Changeset 14100 for trunk/wp-admin/menu.php

Timestamp:

04/16/2010 03:29:34 AM (15 years ago)

Author:

nacin

Message:

Fix menu icons for custom post types. Fixes #12992, props wmrom.

File:

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

trunk/wp-admin/menu.php

@@ -80 +80 @@
 $menu[4] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
 
-$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-posts', 'menu-posts', 'div' );
+$menu[5] = array( __('Posts'), 'edit_posts', 'edit.php', '', 'open-if-no-js menu-top menu-icon-post', 'menu-posts', 'div' );
     $submenu['edit.php'][5]  = array( __('Edit'), 'edit_posts', 'edit.php' );
     /* translators: add new post */
@@ -105 +105 @@
     $submenu['link-manager.php'][15] = array( __('Link Categories'), 'manage_categories', 'edit-link-categories.php' );
 
-$menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-pages', 'menu-pages', 'div' );
+$menu[20] = array( __('Pages'), 'edit_pages', 'edit.php?post_type=page', '', 'menu-top menu-icon-page', 'menu-pages', 'div' );
     $submenu['edit.php?post_type=page'][5] = array( __('Edit'), 'edit_pages', 'edit.php?post_type=page' );
     /* translators: add new page */
@@ -115 +115 @@
 
 foreach ( (array) get_post_types( array('show_ui' => true) ) as $ptype ) {
-    $ptype_obj = get_post_type_object($ptype);
-    $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';
+    $ptype_obj = get_post_type_object( $ptype );
+    $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.
+    if ( is_string( $ptype_obj->menu_icon ) ) {
+        $menu_icon   = esc_url( $ptype_obj->menu_icon );
+        $ptype_class = sanitize_html_class( $ptype );
+    } else {
+        $menu_icon   = 'div';
+        $ptype_class = 'post';
+    }
 
     // if $ptype_menu_position is already populated or will be populated by a hard-coded value below, increment the position.
@@ -124 +130 @@
         $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);
+    $menu[$ptype_menu_position] = array( esc_attr( $ptype_obj->label ), $ptype_obj->edit_type_cap, "edit.php?post_type=$ptype", '', 'menu-top menu-icon-' . $ptype_class, 'menu-' . $ptype_class, $menu_icon );
     $submenu["edit.php?post_type=$ptype"][5]  = array( __('Edit'), $ptype_obj->edit_type_cap,  "edit.php?post_type=$ptype");
     /* translators: add new custom post type */