Ticket #16714: add-new.diff

wp-includes/post.php

@@ -1296 +1296 @@
                 'edit_others_posts'  => 'edit_others_'  . $plural_base,
                 'publish_posts'      => 'publish_'      . $plural_base,
                 'read_private_posts' => 'read_private_' . $plural_base,
-                // Post creation capability simply maps to edit_posts by default:
-                'create_posts'       => 'edit_'         . $plural_base,
         );
 
+        // Post creation capability simply maps to edit_posts by default:
+        if ( ! isset( $args->capabilities['create_posts'] ) )
+                $default_capabilities['create_posts'] = 'edit_' . $plural_base;
+
         // Primitive capabilities used within map_meta_cap():
         if ( $args->map_meta_cap ) {
                 $default_capabilities_for_mapping = array(

wp-admin/post-new.php

@@ -36 +36 @@
 
 $editing = true;
 
-if ( ! current_user_can( $post_type_object->cap->edit_posts ) )
+if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) )
         wp_die( __( 'Cheatin’ uh?' ) );
 
 // Schedule auto-draft cleanup

wp-admin/edit-form-advanced.php

@@ -274 +274 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?><?php if ( isset( $post_new_file ) ) : ?> <a href="<?php echo esc_url( $post_new_file ) ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a><?php endif; ?></h2>
+<h2><?php
+echo esc_html( $title );
+if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) )
+        echo ' <a href="' . esc_url( $post_new_file ) . '" class="add-new-h2">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
+?></h2>
 <?php if ( $notice ) : ?>
 <div id="notice" class="error"><p><?php echo $notice ?></p></div>
 <?php endif; ?>

wp-admin/edit.php

@@ -221 +221 @@
 ?>
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $post_type_object->labels->name ); ?> <a href="<?php echo $post_new_file ?>" class="add-new-h2"><?php echo esc_html($post_type_object->labels->add_new); ?></a> <?php
+<h2><?php
+echo esc_html( $post_type_object->labels->name );
+if ( current_user_can( $post_type_object->cap->create_posts ) )
+        echo ' <a href="' . esc_url( $post_new_file ) . '" class="add-new-h2">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
 if ( ! empty( $_REQUEST['s'] ) )
-        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() ); ?>
-</h2>
+        printf( ' <span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', get_search_query() );
+?></h2>
 
 <?php if ( isset( $_REQUEST['locked'] ) || isset( $_REQUEST['updated'] ) || isset( $_REQUEST['deleted'] ) || isset( $_REQUEST['trashed'] ) || isset( $_REQUEST['untrashed'] ) ) {
         $messages = array();