Changeset 5996

Timestamp:

10/04/2017 02:45:22 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Plugin Directory: Make sure that Status_Transitions::approved() and ::rejected() only run on status change, not on subsequent edits.

See #3180.

File:

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

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

@@ -25 +25 @@
      */
     private function __construct() {
-        add_action( 'transition_post_status', array( $this, 'record_status_change' ), 11, 3 );
-
-        add_action( 'approved_plugin', array( $this, 'approved' ), 10, 2 );
-        add_action( 'rejected_plugin', array( $this, 'rejected' ), 10, 2 );
+        add_action( 'transition_post_status', array( $this, 'transition_post_status' ), 11, 3 );
     }
 
@@ -107 +104 @@
 
     /**
-     * Records the time a plugin was transitioned into a specific status.
+     * Calls the methods that should fire when a plugin is transitioned
+     * to a specific status.
      *
      * @param string   $new_status New post status.
@@ -113 +111 @@
      * @param \WP_Post $post       Post object.
      */
-    public function record_status_change( $new_status, $old_status, $post ) {
-        if ( 'plugin' === $post->post_type ) {
-            update_post_meta( $post->ID, "_{$new_status}", strtotime( $post->post_modified_gmt ) );
-        }
+    public function transition_post_status( $new_status, $old_status, $post ) {
+        if ( 'plugin' !== $post->post_type ) {
+            return;
+        }
+
+        // Bail if no status change.
+        if ( $old_status === $new_status ) {
+            return;
+        }
+
+        switch ( $new_status ) {
+            case 'approved':
+                $this->approved( $post->ID, $post );
+                break;
+            case 'rejected':
+                $this->rejected( $post->ID, $post );
+                break;
+        }
+
+        // Record the time a plugin was transitioned into a specific status.
+        update_post_meta( $post->ID, "_{$new_status}", strtotime( $post->post_modified_gmt ) );
     }
 
@@ -216 +231 @@
         }
 
-        // Prevent recursive calling via wp_update_post().
-        remove_action( 'rejected_plugin', array( $this, 'rejected' ), 10 );
-
         // Change slug to 'rejected-plugin-name-rejected' to free up 'plugin-name'.
         wp_update_post( array(
@@ -224 +236 @@
             'post_name' => sprintf( 'rejected-%s-rejected', $post->post_name )
         ) );
-
-        // Re-add action.
-        add_action( 'rejected_plugin', array( $this, 'rejected' ), 10, 2 );
 
         // Send email.