Changeset 22908

Timestamp:

11/28/2012 10:28:20 PM (12 years ago)

Author:

nacin

Message:

Use the create_posts post type cap in more places. Remove the janky create_posts meta cap. see #16714.

Location:

trunk

Files:

• wp-admin/index.php (modified) (1 diff)
• wp-admin/menu.php (modified) (2 diffs)
• wp-admin/press-this.php (modified) (1 diff)
• wp-includes/admin-bar.php (modified) (2 diffs)
• wp-includes/capabilities.php (modified) (1 diff)
• wp-includes/class-wp-xmlrpc-server.php (modified) (3 diffs)

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( 'create_posts' ) ) {
+if ( current_user_can( get_post_type_object( 'post' )->cap->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/menu.php

@@ -50 +50 @@
     $submenu['edit.php'][5]  = array( __('All Posts'), 'edit_posts', 'edit.php' );
     /* translators: add new post */
-    $submenu['edit.php'][10]  = array( _x('Add New', 'post'), 'create_posts', 'post-new.php' );
+    $submenu['edit.php'][10]  = array( _x('Add New', 'post'), get_post_type_object( 'post' )->cap->create_posts, 'post-new.php' );
 
     $i = 15;
@@ -82 +82 @@
     $submenu['edit.php?post_type=page'][5] = array( __('All Pages'), 'edit_pages', 'edit.php?post_type=page' );
     /* translators: add new page */
-    $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), 'edit_pages', 'post-new.php?post_type=page' );
+    $submenu['edit.php?post_type=page'][10] = array( _x('Add New', 'page'), get_post_type_object( 'page' )->cap->create_posts, 'post-new.php?post_type=page' );
     $i = 15;
     foreach ( get_taxonomies( array(), 'objects' ) as $tax ) {

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' ) || ! current_user_can( 'create_posts' ) )
+if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) )
     wp_die( __( 'Cheatin’ uh?' ) );
 

trunk/wp-includes/admin-bar.php

@@ -364 +364 @@
         ) );
 
-        if ( current_user_can( 'edit_posts' ) ) {
+        if ( current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
             $wp_admin_bar->add_menu( array(
                 'parent' => $menu_id,
@@ -371 +371 @@
                 'href'   => admin_url( 'post-new.php' ),
             ) );
+        }
+
+        if ( current_user_can( 'edit_posts' ) ) {
             $wp_admin_bar->add_menu( array(
                 'parent' => $menu_id,

trunk/wp-includes/capabilities.php

@@ -1061 +1061 @@
         }
         break;
-    // current_user_can( 'create_posts', $post_type )
-    case 'create_posts':
-        $post_type = isset( $args[0] ) ? $args[0] : 'post';
-        $post_type_object = get_post_type_object( $post_type );
-
-        $caps[] = $post_type_object->cap->create_posts;
-
-        break;
         // edit_post breaks down to edit_posts, edit_published_posts, or
         // edit_others_posts

trunk/wp-includes/class-wp-xmlrpc-server.php

@@ -1017 +1017 @@
                 return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
         } else {
-            if ( ! current_user_can( $post_type->cap->edit_posts ) )
+            if ( ! current_user_can( $post_type->cap->create_posts ) || ! current_user_can( $post_type->cap->edit_posts ) )
                 return new IXR_Error( 401, __( 'Sorry, you are not allowed to post on this site.' ) );
         }
@@ -3929 +3929 @@
 
         $cap = ($publish) ? 'publish_posts' : 'edit_posts';
-        if ( !current_user_can($cap) )
+        if ( ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) || !current_user_can($cap) )
             return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.'));
 
@@ -4144 +4144 @@
         }
 
+        if ( ! current_user_can( get_post_type_object( $post_type )->cap->create_posts ) )
+            return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish posts on this site.' ) );
         if ( !current_user_can( $cap ) )
             return new IXR_Error( 401, $error_message );