Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-05 18:32:23 +01:00
Code Issues Projects Releases Wiki Activity

Block Editor: Show privacy help notice on Privacy Policy page.

Browse Source 
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.
Built from https://develop.svn.wordpress.org/trunk@44291


git-svn-id: http://core.svn.wordpress.org/trunk@44121 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
desrosj 2018-12-18 16:14:49 +00:00
parent 985bed281c
commit 38d1e7233d
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/admin-filters.php
View File

@ -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 ); add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'text_change_check' ), 100 );
// Show a "postbox" with the text suggestions for a privacy policy. // 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 the suggested policy text from WordPress.
add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'add_suggested_content' ), 1 ); add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'add_suggested_content' ), 1 );

7
wp-admin/includes/misc.php
View File

@ -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. * Add a notice with a link to the guide when editing the privacy policy page.
* *
* @since 4.9.6 * @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 ) ) { if ( ! ( $post instanceof WP_Post ) ) {
return; return;
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.1-alpha-44286'; $wp_version = '5.1-alpha-44291';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.