Changeset 13931

Timestamp:

07/26/2024 04:56:43 AM (2 years ago)

Author:

dd32

Message:

Plugin Directory: Release Confirmation: Move the front-end notice logic from the theme to the Shortcode.

See ​https://github.com/WordPress/wordpress.org/pull/344.
See #7704.

Location:

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

Files:

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

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

@@ -285 +285 @@
 
         static function can_access() {
-                // Plugin reviewers can always access the release management functionality.
-                if ( current_user_can( 'plugin_review' ) ) {
+                if ( ! is_user_logged_in() ) {
+                        return false;
+                }
+
+                // Plugin reviewers can always access the release management functionality, in wp-admin.
+                if ( current_user_can( 'plugin_review' ) && is_admin() ) {
                         return true;
                 }
@@ -359 +363 @@
                 add_filter( 'wporg_noindex_request', '__return_true' );
         }
+
+        /**
+         * Displays the notice on the plugin front-end.
+         *
+         * @param WP_Post $post The currently displayed post.
+         * @return void
+         */
+        static function frontend_unconfirmed_releases_notice( $post = null ) {
+                $post = get_post( $post );
+
+                if ( ! $post->release_confirmation || ! current_user_can( 'plugin_admin_edit', $post ) ) {
+                        return;
+                }
+
+                $releases = Plugin_Directory::get_releases( $post ) ?: [];
+                $warning  = false;
+
+                foreach ( $releases as $release ) {
+                        if ( ! $release['confirmed'] && $release['confirmations_required'] && empty( $release['discarded'] ) ) {
+                                $warning = true;
+                                break;
+                        }
+                }
+
+                if ( ! $warning ) {
+                        return;
+                }
+
+                printf(
+                        '<div class="plugin-notice notice notice-info notice-alt"><p>%s</p></div>',
+                        sprintf(
+                                __( 'This plugin has <a href="%s">a pending release that requires confirmation</a>.', 'wporg-plugins' ),
+                                home_url( '/developers/releases/' ) // TODO: Hardcoded URL.
+                        )
+                );
+        }
 }

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

@@ -14 +14 @@
 use WordPressdotorg\Plugin_Directory\Template;
 use WordPressdotorg\Plugin_Directory\Tools;
+use WordPressdotorg\Plugin_Directory\Shortcodes\Release_Confirmation;
 
 /**
@@ -258 +259 @@
 
 function the_unconfirmed_releases_notice() {
-        $plugin = get_post();
-
-        if ( ! $plugin->release_confirmation || ! current_user_can( 'plugin_admin_edit', $plugin ) ) {
-                return;
-        }
-
-        $releases = Plugin_Directory::get_releases( $plugin ) ?: [];
-        $warning  = false;
-
-        foreach ( $releases as $release ) {
-                if ( ! $release['confirmed'] && $release['confirmations_required'] && empty( $release['discarded'] ) ) {
-                        $warning = true;
-                        break;
-                }
-        }
-
-        if ( ! $warning ) {
-                return;
-        }
-
-        printf(
-                '<div class="plugin-notice notice notice-info notice-alt"><p>%s</p></div>',
-                sprintf(
-                        __( 'This plugin has <a href="%s">a pending release that requires confirmation</a>.', 'wporg-plugins' ),
-                        home_url( '/developers/releases/' ) // TODO: Hardcoded URL.
-                )
-        );
+        return Release_Confirmation::frontend_unconfirmed_releases_notice();
 }