Changeset 16004

Timestamp:

10/27/2010 08:48:55 AM (16 years ago)

Author:

nacin

Message:

Don't check the raw edit_others_posts cap. see #12702.

Location:

trunk/wp-admin/includes

Files:

• list-table-media.php (modified) (2 diffs)
• post.php (modified) (2 diffs)

trunk/wp-admin/includes/list-table-media.php

@@ -91 +91 @@
         function extra_tablenav( $which ) {
                 global $post_type, $detached;
+                $post_type_obj = get_post_type_object( $post_type );
 ?>
                 <div class="alignleft actions">
@@ -105 +106 @@
                 if ( $detached ) { ?>
                         <input type="submit" id="find_detached" name="find_detached" value="<?php esc_attr_e( 'Scan for lost attachments' ); ?>" class="button-secondary" />
-                <?php } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) { ?>
+                <?php } elseif ( $this->is_trash && current_user_can( $post_type_obj->cap->edit_others_posts ) ) { ?>
                         <input type="submit" id="delete_all" name="delete_all" value="<?php esc_attr_e( 'Empty Trash' ); ?>" class="button-secondary apply" />
                 <?php } ?>

trunk/wp-admin/includes/post.php

@@ -206 +206 @@
         wp_set_post_lock( $post_ID, $GLOBALS['current_user']->ID );
 
-        if ( current_user_can( 'edit_others_posts' ) ) {
-                if ( !empty($post_data['sticky']) )
-                        stick_post($post_ID);
+        if ( current_user_can( $ptype->cap->edit_others_posts ) ) {
+                if ( ! empty( $post_data['sticky'] ) )
+                        stick_post( $post_ID );
                 else
-                        unstick_post($post_ID);
+                        unstick_post( $post_ID );
         }
 
@@ -337 +337 @@
                 $updated[] = wp_update_post( $post_data );
 
-                if ( isset( $post_data['sticky'] ) && current_user_can( 'edit_others_posts' ) ) {
+                if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
                         if ( 'sticky' == $post_data['sticky'] )
                                 stick_post( $post_ID );