Changeset 3093 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php

Timestamp:

05/06/2016 06:56:40 PM (8 years ago)

Author:

obenland

Message:

Plugin Directory: Allow Committers and Reviewers to edit_others_posts.

WordPress seems to require users to have that capability globally for a post
type, in order to make changes to others posts, even if it's only certain
others posts.

This switches to using plugin_review and plugin_approve capabilities to
control Reviewers and Committers access to certain plugins. It also improves
the logic for displaying links to the various post status views in the plugins
list table.

See #1570.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/list-table/class-plugin-posts.php

@@ -330 +330 @@
         $mine            = '';
 
-        $plugins = Tools::get_users_write_access_plugins( get_current_user_id() );
+        $plugins = Tools::get_users_write_access_plugins( $current_user_id );
         $plugins = array_map( 'sanitize_title_for_query', $plugins );
         $exclude_states   = get_post_stati( array(
@@ -336 +336 @@
         ) );
 
+        if ( ! current_user_can( 'plugin_approve' ) ) {
+            $exclude_states = array_merge( $exclude_states, array(
+                'publish'  => 'publish',
+                'closed'   => 'closed',
+                'rejected' => 'rejected',
+                'private'  => 'private',
+            ) );
+        }
+
         $user_post_count = intval( $wpdb->get_var( $wpdb->prepare( "
             SELECT COUNT( 1 )
             FROM $wpdb->posts
             WHERE post_type = %s
-            AND post_status NOT IN ( '" . implode( "','", $exclude_states ) . "' )
             AND ( post_author = %d OR post_name IN ( '" . implode( "','", $plugins ) . "' ) )
         ", $post_type, $current_user_id ) ) );
@@ -350 +358 @@
 
         if ( $user_post_count && $user_post_count !== $total_posts ) {
-            if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) ) {
+            if ( isset( $_GET['author'] ) && $_GET['author'] == $current_user_id ) {
                 $class = 'current';
             }
@@ -370 +378 @@
             );
 
-            if ( ! current_user_can( 'plugin_edit_others' ) && ! current_user_can( 'plugin_edit_pending' ) ) {
+            if ( ! current_user_can( 'plugin_review' ) ) {
                 $status_links['mine'] = $this->get_edit_link( $mine_args, $mine_inner_html, 'current' );;
                 return $status_links;
@@ -410 +418 @@
             }
 
+            if ( ! current_user_can( 'plugin_approve' ) && ! in_array( $status_name, array( 'draft', 'pending' ) ) ) {
+                continue;
+            }
+
             if ( isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status'] ) {
                 $class = 'current';