Changeset 2929

Timestamp:

04/11/2016 01:37:50 PM (9 years ago)

Author:

obenland

Message:

Plugin Directory: Allow committer mangament only for active plugins.

Plugins that are not yet live or are deprecated/hidden, should not have
committers added to them.

See #1570.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin

Files:

• class-customizations.php (modified) (3 diffs)
• metabox/class-committers.php (modified) (4 diffs)

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

@@ -26 +26 @@
     private function __construct() {
         // Admin Metaboxes
-        add_action( 'add_meta_boxes', array( $this, 'register_admin_metaboxes' ), 10, 1 );
+        add_action( 'add_meta_boxes', array( $this, 'register_admin_metaboxes' ), 10, 2 );
         add_action( 'do_meta_boxes', array( $this, 'replace_title_global' ) );
 
@@ -220 +220 @@
      * Register the Admin metaboxes for the plugin management screens.
      *
-     * @param string $post_type The post type of the current screen.
+     * @param string   $post_type The post type of the current screen.
+     * @param \WP_Post $post      Post object.
      * @return void.
      */
-    public function register_admin_metaboxes( $post_type ) {
+    public function register_admin_metaboxes( $post_type, $post ) {
         if ( 'plugin' != $post_type ) {
             return;
@@ -260 +261 @@
         );
 
-        add_meta_box(
-            'plugin-committers',
-            __( 'Plugin Committers', 'wporg-plugins' ),
-            array( __NAMESPACE__ . '\Metabox\Committers', 'display' ),
-            'plugin', 'side'
-        );
+        if ( 'publish' === $post->post_status ) {
+            add_meta_box(
+                'plugin-committers',
+                __( 'Plugin Committers', 'wporg-plugins' ),
+                array( __NAMESPACE__ . '\Metabox\Committers', 'display' ),
+                'plugin', 'side'
+            );
+        }
 
         // Remove unnecessary metaboxes.

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-committers.php

@@ -40 +40 @@
 
         check_ajax_referer( 'add-committer' );
+
+        if ( ! current_user_can( 'plugin_add_committer', $post_id ) || 'publish' !== get_post_status( $post_id ) ) {
+            wp_die( -1 );
+        }
+
         global $post;
 
@@ -51 +56 @@
             ) );
             $response->send();
-        }
-
-        if ( ! current_user_can( 'plugin_add_committer', $post_id ) ) {
-                wp_die( -1 );
         }
 
@@ -89 +90 @@
         check_ajax_referer( "remove-committer-$id" );
 
+        if ( ! current_user_can( 'plugin_remove_committer', $post_id ) || 'publish' !== get_post_status( $post_id ) ) {
+            wp_die( -1 );
+        }
+
         $response    = new \WP_Ajax_Response();
         $plugin_slug = get_post( $post_id )->post_name;
@@ -100 +105 @@
         }
 
-        if ( ! current_user_can( 'plugin_remove_committer', $post_id ) ) {
-                wp_die( -1 );
-        }
-
         $result = Tools::revoke_plugin_committer( $plugin_slug, $committer );