Changeset 13308

Timestamp:

03/12/2024 02:27:28 AM (9 months ago)

Author:

dd32

Message:

Plugin Directory: Upload: Don't overwrite the post_date field when uploading a new version of the plugin.

This will allow for more performant queries for pending plugins.

See #7384

Location:

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

Files:

• class-plugin-directory.php (modified) (2 diffs)
• shortcodes/class-upload-handler.php (modified) (4 diffs)

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

@@ -1834 +1834 @@
         $slug  = $args['post_name'] ?: sanitize_title( $title );
 
+        // Remove null items (date-related fields) to fallback to the defaults below.
+        $args = array_filter(
+            $args,
+            function( $item ) {
+                return ! is_null( $item );
+            }
+        );
+
         $post_date     = current_time( 'mysql' );
         $post_date_gmt = current_time( 'mysql', 1 );
@@ -1847 +1855 @@
         ) );
 
-        $update = ! empty( $args['ID'] );
         $result = wp_insert_post( $args, true );
 
         if ( ! is_wp_error( $result ) ) {
             wp_cache_set( $result, $slug, 'plugin-slugs' );
+
             $result = get_post( $result );
-
-            if ( ! $update ) {
-                $owner = get_userdata( $result->post_author );
-                Tools::audit_log( sprintf(
-                    'Submitted by <a href="%s">%s</a>.',
-                    esc_url( 'https://profiles.wordpress.org/' . $owner->user_nicename . '/' ),
-                    $owner->user_login
-                ), $result->ID );
-            }
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-upload-handler.php

@@ -6 +6 @@
 use WordPressdotorg\Plugin_Directory\Readme\Parser;
 use WordPressdotorg\Plugin_Directory\Plugin_Directory;
+use WordPressdotorg\Plugin_Directory\Tools;
 use WordPressdotorg\Plugin_Directory\Tools\Filesystem;
 use WordPressdotorg\Plugin_Directory\Admin\Tools\Upload_Token;
@@ -422 +423 @@
 
         $post_args = array(
-            'ID'           => $plugin_post->ID ?? 0,
-            'post_title'   => $this->plugin['Name'],
-            'post_name'    => $this->plugin_slug,
-            'post_status'  => $plugin_post->post_status ?? 'new',
-            'post_content' => $content,
-            'post_excerpt' => $this->plugin['Description'],
+            'ID'            => $plugin_post->ID ?? 0,
+            'post_title'    => $this->plugin['Name'],
+            'post_name'     => $this->plugin_slug,
+            'post_status'   => $plugin_post->post_status ?? 'new',
+            'post_content'  => $content,
+            'post_excerpt'  => $this->plugin['Description'],
+            'post_date'     => $plugin_post->post_date ?? null,
+            'post_date_gmt' => $plugin_post->post_date_gmt ?? null,
             // 'tax_input'    => wp_unslash( $_POST['tax_input'] ), // for category selection
             'meta_input'   => array(
@@ -466 +469 @@
 
         // First time submission, track some additional metadata.
-        if ( ! $plugin_post ) {
+        if ( ! $updating_existing ) {
             $post_args['meta_input']['_author_ip']        = preg_replace( '/[^0-9a-fA-F:., ]/', '', $_SERVER['REMOTE_ADDR'] );
             $post_args['meta_input']['_submitted_date']   = time();
@@ -477 +480 @@
         if ( is_wp_error( $plugin_post ) ) {
             return $plugin_post;
+        }
+
+        // Record the submitter.
+        if ( ! $updating_existing ) {
+            Tools::audit_log(
+                sprintf(
+                    'Submitted by <a href="%s">%s</a>.',
+                    esc_url( 'https://profiles.wordpress.org/' . wp_get_current_user()->user_nicename . '/' ),
+                    wp_get_current_user()->user_login
+                ),
+                $plugin_post->ID
+            );
         }