diff --git a/wp-admin/includes/admin-filters.php b/wp-admin/includes/admin-filters.php index ba2cb7e2bd..43a159038a 100644 --- a/wp-admin/includes/admin-filters.php +++ b/wp-admin/includes/admin-filters.php @@ -144,7 +144,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/wp-admin/includes/misc.php b/wp-admin/includes/misc.php index caa923f1df..b3c4ec4a7c 100644 --- a/wp-admin/includes/misc.php +++ b/wp-admin/includes/misc.php @@ -1540,10 +1540,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; } diff --git a/wp-includes/blocks/archives.php b/wp-includes/blocks/archives.php index c94a4645d9..85186ce612 100644 --- a/wp-includes/blocks/archives.php +++ b/wp-includes/blocks/archives.php @@ -32,7 +32,7 @@ function render_block_core_archives( $attributes ) { $class .= ' wp-block-archives-dropdown'; $dropdown_id = esc_attr( uniqid( 'wp-block-archives-' ) ); - $title = __( 'Archives' ); + $title = __( 'Archives', 'default' ); /** This filter is documented in wp-includes/widgets/class-wp-widget-archives.php */ $dropdown_args = apply_filters( @@ -50,19 +50,19 @@ function render_block_core_archives( $attributes ) { switch ( $dropdown_args['type'] ) { case 'yearly': - $label = __( 'Select Year' ); + $label = __( 'Select Year', 'default' ); break; case 'monthly': - $label = __( 'Select Month' ); + $label = __( 'Select Month', 'default' ); break; case 'daily': - $label = __( 'Select Day' ); + $label = __( 'Select Day', 'default' ); break; case 'weekly': - $label = __( 'Select Week' ); + $label = __( 'Select Week', 'default' ); break; default: - $label = __( 'Select Post' ); + $label = __( 'Select Post', 'default' ); break; } @@ -101,7 +101,7 @@ function render_block_core_archives( $attributes ) { $block_content = sprintf( '