Ticket #45057: 45057.2.diff

src/wp-admin/includes/admin-filters.php

@@ -144 +144 @@
 add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'text_change_check' ), 100 );
 
 // Show a "postbox" with the text suggestions for a privacy policy.
-add_action( 'edit_form_after_title', array( 'WP_Privacy_Policy_Content', 'notice' ) );
+add_action( 'admin_notices', array( 'WP_Privacy_Policy_Content', 'notice' ) );
 
 // Add the suggested policy text from WordPress.
 add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'add_suggested_content' ), 1 );

src/wp-admin/includes/misc.php

@@ -1540 +1540 @@
          * Add a notice with a link to the guide when editing the privacy policy page.
          *
          * @since 4.9.6
+         * @since 5.0.0 The $post parameter is now optional.
          *
-         * @param WP_Post $post The currently edited post.
+         * @param WP_Post|null $post The currently edited post. Default is null.
          */
-        public static function notice( $post ) {
+        public static function notice( $post = null ) {
+                $post = get_post( $post );
+
                 if ( ! ( $post instanceof WP_Post ) ) {
                         return;
                 }
@@ -1559 +1562 @@
                 }
 
                 ?>
-                <div class="notice notice-warning inline wp-pp-notice">
+                <div class="notice notice-warning wp-pp-notice">
                         <p>
                         <?php
                         /* translators: 1: Privacy Policy guide URL, 2: additional link attributes, 3: accessibility text */