Ticket #21391: attachment-show-ui.diff

wp-includes/version.php

@@ -18 +18 @@
  *
  * @global string $tinymce_version
  */
-$tinymce_version = '3541-21360';
+$tinymce_version = '3541-21361';
 
 /**
  * Holds the required PHP version

wp-includes/post.php

@@ -52 +52 @@
 
         register_post_type( 'attachment', array(
                 'labels' => array(
-                        'name' => __( 'Media' ),
+                        'name' => _x('Media', 'post type general name'),
+                        'singular_name' => _x( 'Media Item', 'post type singular name' ),
+                        'add_new' => _x( 'Add New', 'media item'),
+                        'add_new_item' => __( 'Add New Media' ),
                         'edit_item' => __( 'Edit Media' ),
+                        'new_item' => __( 'New Media Item' ),
+                        'view_item' => __( 'View Attachment Page' ),
+                        'search_items' => __( 'Search Media' ),
+                        'not_found' => __( 'No media found.' ),
+                        'not_found_in_trash' => __('No media found in Trash.'),
+                        'parent_item_colon' => __('Parent:'),
+                        'all_items' => __( 'All Media' ),
                 ),
                 'public' => true,
-                'show_ui' => false,
+                'show_ui' => true,
                 '_builtin' => true, /* internal use only. don't use this when registering your own post type. */
-                '_edit_link' => 'media.php?attachment_id=%d', /* 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. */
                 'capability_type' => 'post',
                 'map_meta_cap' => true,
                 'hierarchical' => false,
@@ -66 +76 @@
                 'query_var' => false,
                 'show_in_nav_menus' => false,
                 'delete_with_user' => true,
-                'supports' => array( 'comments', 'author' ),
+                'supports' => array( 'title', 'author', 'comments' ),
         ) );
 
         register_post_type( 'revision', array(

wp-admin/includes/post.php

@@ -1082 +1082 @@
 
         list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
 
-        if ( 'publish' == $post->post_status ) {
+        if ( 'publish' == get_post_status( $post ) ) {
                 $ptype = get_post_type_object($post->post_type);
                 $view_post = $ptype->labels->view_item;
                 $title = __('Click to edit this part of the permalink');

wp-admin/includes/screen.php

@@ -96 +96 @@
         if ( $use_defaults ) {
                 $hidden = array();
                 if ( 'post' == $screen->base ) {
-                        if ( 'post' == $screen->post_type || 'page' == $screen->post_type )
+                        if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type )
                                 $hidden = array('slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
                         else
                                 $hidden = array( 'slugdiv' );

wp-admin/post.php

@@ -31 +31 @@
 if ( $post ) {
         $post_type = $post->post_type;
         $post_type_object = get_post_type_object( $post_type );
+        $parent_file = 'upload.php';
 }
 
 /**
@@ -148 +149 @@
                 $parent_file = "edit.php";
                 $submenu_file = "edit.php";
                 $post_new_file = "post-new.php";
+        } elseif ( 'attachment' === $post_type ) {
+                $parent_file = 'upload.php';
+                $submenu_file = 'upload.php';
+                $post_new_file = 'media-new.php';
         } else {
                 if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
                         $parent_file = $post_type_object->show_in_menu;