Ticket #48431: 48431.1.diff

src/wp-admin/includes/class-wp-privacy-policy-content.php

@@ -318 +318 @@
                         return;
                 }
 
+                $current_screen = get_current_screen();
                 $policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
 
-                if ( ! $policy_page_id || $policy_page_id !== $post->ID ) {
-                        return;
-                }
-
                 $message = __( 'Need help putting together your new Privacy Policy page? Check out our guide for recommendations on what content to include, along with policies suggested by your plugins and theme.' );
                 $url     = esc_url( admin_url( 'privacy-policy-guide.php' ) );
                 $label   = __( 'View Privacy Policy Guide.' );
 
-                if ( get_current_screen()->is_block_editor() ) {
-                        wp_enqueue_script( 'wp-notices' );
-                        $action = array(
-                                'url'   => $url,
-                                'label' => $label,
-                        );
-                        wp_add_inline_script(
-                                'wp-notices',
-                                sprintf(
-                                        'wp.data.dispatch( "core/notices" ).createWarningNotice( "%s", { actions: [ %s ], isDismissible: false } )',
-                                        $message,
-                                        wp_json_encode( $action )
-                                ),
-                                'after'
-                        );
-                } else {
-                        ?>
-                        <div class="notice notice-warning inline wp-pp-notice">
-                                <p>
-                                <?php
-                                echo $message;
-                                printf(
-                                        ' <a href="%s" target="_blank">%s <span class="screen-reader-text">%s</span></a>',
-                                        $url,
-                                        $label,
-                                        /* translators: Accessibility text. */
-                                        __( '(opens in a new tab)' )
+                if ( 'post' === $current_screen->base && $policy_page_id === $post->ID ) {
+                        if ( get_current_screen()->is_block_editor() ) {
+                                wp_enqueue_script( 'wp-notices' );
+                                $action = array(
+                                        'url'   => $url,
+                                        'label' => $label,
+                                );
+                                wp_add_inline_script(
+                                        'wp-notices',
+                                        sprintf(
+                                                'wp.data.dispatch( "core/notices" ).createWarningNotice( "%s", { actions: [ %s ], isDismissible: false } )',
+                                                $message,
+                                                wp_json_encode( $action )
+                                        ),
+                                        'after'
                                 );
+                        } else {
                                 ?>
-                                </p>
-                        </div>
-                        <?php
+                                <div class="notice notice-warning inline wp-pp-notice">
+                                        <p>
+                                        <?php
+                                        echo $message;
+                                        printf(
+                                                ' <a href="%s" target="_blank">%s <span class="screen-reader-text">%s</span></a>',
+                                                $url,
+                                                $label,
+                                                /* translators: Accessibility text. */
+                                                __( '(opens in a new tab)' )
+                                        );
+                                        ?>
+                                        </p>
+                                </div>
+                                <?php
+                        }
                 }
         }