Ticket #16406: 16406.2.diff

wp-includes/post.php

@@ -18 +18 @@
  */
 function create_initial_post_types() {
         register_post_type( 'post', array(
+                'labels' => array(
+                        'name_admin_bar' => _x( 'Post', 'add new on admin bar' ),
+                ),
                 'public'  => true,
                 '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
                 '_edit_link' => 'post.php?post=%d', /* internal use only. don't use this when registering your own post type. */
@@ -30 +33 @@
         ) );
 
         register_post_type( 'page', array(
+                'labels' => array(
+                        'name_admin_bar' => _x( 'Page', 'add new on admin bar' ),
+                ),
                 'public' => true,
                 'publicly_queryable' => false,
                 '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
@@ -1194 +1200 @@
         if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) )
                 $object->labels['singular_name'] = $object->labels['name'];
 
+        if ( ! isset( $object->labels['name_admin_bar'] ) )
+                $object->labels['name_admin_bar'] = isset( $object->labels['singular_name'] ) ? $object->labels['singular_name'] : $object->name;
+
         if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) )
                 $object->labels['menu_name'] = $object->labels['name'];
 

wp-includes/admin-bar.php

@@ -242 +242 @@
                 if ( true !== $ptype_obj->show_in_menu || ! current_user_can( $ptype_obj->cap->edit_posts ) )
                         continue;
 
-                $actions[ 'post-new.php?post_type=' . $ptype_obj->name ] = array( $ptype_obj->labels->singular_name, $ptype_obj->cap->edit_posts, 'new-' . $ptype_obj->name );
+                $actions[ 'post-new.php?post_type=' . $ptype_obj->name ] = array( $ptype_obj->labels->name_admin_bar, $ptype_obj->cap->edit_posts, 'new-' . $ptype_obj->name );
         }
 
         if ( current_user_can( 'upload_files' ) )