From 07cf8f3073880ae33756e040e85387f616392e90 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Tue, 18 Dec 2018 16:13:59 +0000 Subject: [PATCH] Block Editor: Show privacy help notice on Privacy Policy page. When editing a page set to be the Privacy Policy page, display a help notice containing a link to the Privacy Policy guide. Merges [43920] to trunk. Fixes #45057. git-svn-id: https://develop.svn.wordpress.org/trunk@44291 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/admin-filters.php | 2 +- src/wp-admin/includes/misc.php | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/includes/admin-filters.php b/src/wp-admin/includes/admin-filters.php index 16a51b2c53..a1efcc62f4 100644 --- a/src/wp-admin/includes/admin-filters.php +++ b/src/wp-admin/includes/admin-filters.php @@ -146,7 +146,7 @@ add_action( 'wp_privacy_personal_data_erased', '_wp_privacy_send_erasure_fulfill 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 ); diff --git a/src/wp-admin/includes/misc.php b/src/wp-admin/includes/misc.php index 22434e4816..fc57d206bd 100644 --- a/src/wp-admin/includes/misc.php +++ b/src/wp-admin/includes/misc.php @@ -1612,10 +1612,13 @@ final class WP_Privacy_Policy_Content { * 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 null. */ - public static function notice( $post ) { + public static function notice( $post = null ) { + $post = get_post( $post ); + if ( ! ( $post instanceof WP_Post ) ) { return; }