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

Timestamp:

04/12/2024 03:58:20 AM (2 years ago)

Author:

dd32

Message:

Plugin Directory: Allow reviewers to move a plugin from pending (Pending developer feedback) back to new (Pending initial review), and from rejected back to pending (Pending developer feedback)

Fixes #7386.

File:

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

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

@@ -36 +36 @@
 
         /**
-         * Get the list of allowed status transitions for a given plugin.
-         *
-         * @param string $post_status Plugin post status.
+         * Get the list of allowed status transitions for a given plugin status & post.
+         *
+         * @param string   $post_status Plugin post status.
+         * @param \WP_Post $post        Plugin post object.
          *
          * @return array An array of allowed post status transitions.
          */
-        public static function get_allowed_transitions( $post_status ) {
+        public static function get_allowed_transitions( $post_status, $post ) {
+                // NOTE: $post_status and $post->post_status will differ, as it's used during a pre-update hook.
                 switch ( $post_status ) {
                         case 'new':
@@ -48 +50 @@
                                 break;
                         case 'pending':
-                                $transitions = array( 'approved', 'rejected' );
+                                $transitions = array( 'approved', 'rejected', 'new' );
                                 break;
                         case 'approved':
@@ -55 +57 @@
                                 break;
                         case 'rejected':
-                                // Rejections cannot be recovered.
                                 $transitions = array();
+                                // If it was rejected less than a week ago, allow it to be recovered.
+                                $rejected_date = get_post_meta( $post->ID, '_rejected', true );
+                                if ( $rejected_date >= strtotime( '-1 week' ) ) {
+                                        $transitions[] = 'pending';
+                                }
                                 break;
                         case 'publish':
@@ -97 +103 @@
 
                 // ...or it's a plugin admin...
-                if ( current_user_can( 'plugin_approve', $postarr['ID'] ) && in_array( $postarr['post_status'], self::get_allowed_transitions( $old_status ) ) ) {
+                if ( current_user_can( 'plugin_approve', $postarr['ID'] ) && in_array( $postarr['post_status'], self::get_allowed_transitions( $old_status, get_post( $postarr['ID'] ) ) ) ) {
                         return $data;
                 }
@@ -158 +164 @@
                                 $this->set_translation_status( $post, 'inactive' );
                                 break;
+
+                        case 'pending':
+                                if ( 'rejected' === $old_status ) {
+                                        $this->restore_rejected_plugin( $post );
+                                }
+
+                        case 'new':
+                                // If it's moved from Pending to new, unasign.
+                                if ( 'pending' === $old_status ) {
+                                        $this->clear_reviewer( $post );
+                                }
                 }
 
@@ -298 +315 @@
 
         /**
+         * Restores a rejected plugin.
+         *
+         * @param \WP_Post $post Post object.
+         */
+        public function restore_rejected_plugin( $post ) {
+                $slug = $post->post_name;
+                $slug = preg_replace( '!^rejected-(.+)-rejected$!i', '$1', $slug );
+
+                // Change slug back to 'plugin-name'.
+                wp_update_post( array(
+                        'ID'        => $post->ID,
+                        'post_name' => $slug,
+                ) );
+
+                delete_post_meta( $post_id, '_rejection_reason' );
+                delete_post_meta( $post_id, 'plugin_rejected_date' );
+        }
+
+        /**
          * Returns the path to a plugins root directory.
          *