Changeset 10219

Timestamp:

08/28/2020 06:14:41 AM (4 years ago)

Author:

dd32

Message:

Plugin Directory: Release Confirmation: Fix the pending confirmation message on individual plugins, and ensure that the approval text is correct.

See #5352.

Location:

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

Files:

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

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

@@ -169 +169 @@
         if ( ! $data['confirmations_required'] ) {
             _e( 'Release did not require confirmation.', 'wporg-plugins' );
-        } else if ( ! $data['confirmed'] || count( $data['confirmations'] ) >= $data['confirmations_required'] ) {
+        } else if ( $data['confirmed'] ) {
             _e( 'Release confirmed.', 'wporg-plugins' );
         } else if ( 1 == $data['confirmations_required'] ) {

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

@@ -268 +268 @@
     }
 
-    $confirmations_required = $plugin->release_confirmation;
-    $releases               = Plugin_Directory::get_releases( $plugin ) ?: [];
-    $unconfirmed_releases   = wp_list_filter( $confirmed_releases, [ 'confirmed' => false ] );
-
-    if ( ! $unconfirmed_releases ) {
+    $releases = Plugin_Directory::get_releases( $plugin ) ?: [];
+    $warning  = false;
+
+    foreach ( $releases as $release ) {
+        if ( ! $release['confirmed'] && $release['confirmations_required'] ) {
+            $warning = true;
+        }
+    }
+
+    if ( ! $warning ) {
         return;
     }