Changeset 22291

Timestamp:

10/24/2012 10:15:43 PM (12 years ago)

Author:

ryan

Message:

Use the create_posts capability in more places.

In get_post_type_capabilities(), make sure create_posts reflects customizations to the edit_posts capability when create_posts is not specifically set.

Location:

trunk

Files:

• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit.php (modified) (1 diff)
• wp-admin/index.php (modified) (1 diff)
• wp-admin/post-new.php (modified) (1 diff)
• wp-admin/press-this.php (modified) (1 diff)
• wp-includes/post.php (modified) (2 diffs)

trunk/wp-admin/edit-form-advanced.php

@@ -275 +275 @@
 <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>

trunk/wp-admin/edit.php

@@ -222 +222 @@
 <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'] ) ) {

trunk/wp-admin/index.php

@@ -77 +77 @@
 if ( current_user_can( 'publish_posts' ) )
     $help .= '<p>' . __('<strong>Incoming Links</strong> - Shows links to your site found by Google Blog Search.') . '</p>';
-if ( current_user_can( 'edit_posts' ) ) {
+if ( current_user_can( 'create_posts' ) ) {
     $help .= '<p>' . __('<strong>QuickPress</strong> - Allows you to create a new post and either publish it or save it as a draft.') . '</p>';
     $help .= '<p>' . __('<strong>Recent Drafts</strong> - Displays links to the 5 most recent draft posts you&#8217;ve started.') . '</p>';

trunk/wp-admin/post-new.php

@@ -37 +37 @@
 $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?' ) );
 

trunk/wp-admin/press-this.php

@@ -14 +14 @@
 header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
 
-if ( ! current_user_can('edit_posts') )
+if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( 'create_posts' ) )
     wp_die( __( 'Cheatin’ uh?' ) );
 

trunk/wp-includes/post.php

@@ -1412 +1412 @@
         '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,
     );
 
@@ -1431 +1429 @@
 
     $capabilities = array_merge( $default_capabilities, $args->capabilities );
+
+    // Post creation capability simply maps to edit_posts by default:
+    if ( ! isset( $capabilities['create_posts'] ) )
+        $capabilities['create_posts'] = $capabilities['edit_posts'];
 
     // Remember meta capabilities for future reference.