Changeset 12816

Timestamp:

08/08/2023 05:38:53 AM (3 years ago)

Author:

dd32

Message:

Plugin Directory: Release Confirmation: Don't display a version in the 'Previous Versions' download form if the version was never confirmed.

Fixes #5902.

Location:

sites/trunk/wordpress.org/public_html/wp-content

Files:

• plugins/plugin-directory/class-plugin-directory.php (modified) (4 diffs)
• themes/pub/wporg-plugins/inc/template-tags.php (modified) (1 diff)

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

@@ -1533 +1533 @@
                                 foreach ( $tags as $tag_version => $tag ) {
                                         self::add_release( $plugin, [
-                                                'date' => strtotime( $tag['date'] ),
-                                                'tag'  => $tag['tag'],
-                                                'version' => $tag_version,
-                                                'committer' => [ $tag['author'] ],
-                                                'confirmations_required' => 0, // Old release, assume it's released.
+                                                'date'                   => strtotime( $tag['date'] ),
+                                                'tag'                    => $tag['tag'],
+                                                'version'                => $tag_version,
+                                                'committer'              => [ $tag['author'] ],
+                                                'zips_built'             => true, // Old release, assume they were built.
+                                                'confirmations_required' => 0,    // Old release, assume it's released.
                                         ] );
                                 }
@@ -1557 +1558 @@
 
                                         self::add_release( $plugin, [
-                                                'date' => strtotime( $entry['date'] ),
-                                                'tag'  => $entry['filename'],
-                                                'version' => $tag,
-                                                'committer' => [ $entry['author'] ],
-                                                'confirmations_required' => 0, // Old release, assume it's released.
+                                                'date'                   => strtotime( $entry['date'] ),
+                                                'tag'                    => $entry['filename'],
+                                                'version'                => $tag,
+                                                'committer'              => [ $entry['author'] ],
+                                                'zips_built'             => true, // Old release, assume they were built.
+                                                'confirmations_required' => 0,    // Old release, assume it's released.
                                         ] );
                                 }
@@ -1567 +1569 @@
 
                         $releases = get_post_meta( $plugin->ID, 'releases', true ) ?: [];
+                }
+
+                /**
+                 * If confirmations weren't required, claim that the ZIPs were built.
+                 *
+                 * This is needed for data pre-[12816].
+                 * @see https://meta.trac.wordpress.org/changeset/12816
+                 */
+                foreach ( $releases as &$release ) {
+                        if ( ! $release['confirmations_required'] && ! $release['zips_built'] ) {
+                                $release['zips_built'] = true;
+                        }
                 }
 
@@ -1600 +1614 @@
                         'tag'                    => '',
                         'version'                => '',
-                        'zips_built'             => false,
+                        // Assume zips built if no release confirmation.
+                        'zips_built'             => ! $plugin->release_confirmation,
                         'confirmations'          => [],
                         // Confirmed by default if no release confiration.

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/inc/template-tags.php

@@ -370 +370 @@
         echo '<select class="previous-versions" onchange="getElementById(\'download-previous-link\').href=this.value;">';
         foreach ( $tags as $version ) {
-                $text = ( 'trunk' === $version ? __( 'Development Version', 'wporg-plugins' ) : $version );
-                printf( '<option value="%s">%s</option>', esc_attr( Template::download_link( $post, $version ) ), esc_html( $text ) );
+                // Check the tag against the confirmed releases.
+                $release = Plugin_Directory::get_release( $post, $version );
+                if ( $release && ! $release['zips_built'] ) {
+                        continue;
+                }
+
+                $text = $version;
+                if ( 'trunk' === $version ) {
+                        $text = __( 'Development Version', 'wporg-plugins' );
+                }
+
+                printf(
+                        '<option value="%s">%s</option>',
+                        esc_attr( Template::download_link( $post, $version ) ),
+                        esc_html( $text )
+                );
         }
         echo '</select> ';