Changeset 13113

Timestamp:

01/16/2024 05:04:43 AM (12 months ago)

Author:

dd32

Message:

Plugin Directory: Submission: All uploaded zips now have this metadata attached, simplify the code added in [13109].

See #7384.

Location:

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

Files:

• admin/metabox/class-review-tools.php (modified) (1 diff)
• shortcodes/class-upload.php (modified) (1 diff)

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

@@ -130 +130 @@
                 $zip_preview                = Template::preview_link_zip( $slug, $zip_file->ID );
                 $zip_pcp                    = Template::preview_link_zip( $slug, $zip_file->ID, 'pcp' );
-                $zip_filename               = $zip_file->submitted_name ?? preg_replace( '!^[0-9-_]+!', '', basename( $zip_url ) );
 
                 printf(
-                    '<li>%1$s <a href="%2$s" title="%3$s">%4$s</a> (%5$s) (<a href="%6$s" target="_blank">preview</a> | <a href="%7$s" target="_blank">pcp</a>)</li>',
+                    '<li>%1$s v%2$s <a href="%3$s" title="%4$s">%5$s</a> (%6$s) (<a href="%7$s" target="_blank">preview</a> | <a href="%8$s" target="_blank">pcp</a>)</li>',
                     esc_html( $zip_date ),
+                    esc_html( $zip_file->version ),
                     esc_url( $zip_url ),
                     esc_attr( $zip_file->post_title ),
-                    esc_html( $zip_filename ),
+                    esc_html( $zip_file->submitted_name ),
                     esc_html( $zip_size ),
                     esc_url( $zip_preview ),

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

@@ -277 +277 @@
                             foreach ( $attached_media as $upload ) {
                                 echo '<li><ul>';
-                                $filename = $upload->submitted_name ?: preg_replace( '!^[0-9-_]+!', '', basename( get_attached_file( $upload->ID ) ) );
-                                $version  = $upload->version ?: $plugin->version;
-
-                                echo '<li><code>' . esc_html( $filename ) . '</code></li>';
-                                echo '<li>' . sprintf( __( 'Version: %s', 'wporg-plugins' ), '<code>' . esc_html( $version ) . '</code>' ) . '</li>';
+                                echo '<li><code>' . esc_html( $upload->submitted_name ) . '</code></li>';
+                                echo '<li>' . sprintf( __( 'Version: %s', 'wporg-plugins' ), '<code>' . esc_html( $upload->version ) . '</code>' ) . '</li>';
                                 echo '<li>' . sprintf( __( 'Upload Date: %s', 'wporg-plugins' ), date_i18n( get_option( 'date_format' ), strtotime( $upload->post_date ) ) ) . '</li>';
                                 echo '</ul></li>';