Privacy: exclude the wrapper from the default policy content.

Fixes #44048.
Built from https://develop.svn.wordpress.org/trunk@43242


git-svn-id: http://core.svn.wordpress.org/trunk@43071 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2018-05-11 15:07:21 +00:00
parent b7ff8e4f9f
commit 5c5a527d96
2 changed files with 6 additions and 5 deletions

View File

@ -1691,10 +1691,12 @@ final class WP_Privacy_Policy_Content {
*/ */
public static function get_default_content( $descr = false ) { public static function get_default_content( $descr = false ) {
$suggested_text = $descr ? '<strong class="privacy-policy-tutorial">' . __( 'Suggested text:' ) . ' </strong>' : ''; $suggested_text = $descr ? '<strong class="privacy-policy-tutorial">' . __( 'Suggested text:' ) . ' </strong>' : '';
$content = '';
// Start of the suggested privacy policy text. // Start of the suggested privacy policy text.
$content = $descr && $content .=
'<div class="wp-suggested-text">' . '<div class="wp-suggested-text">';
$content .=
'<h2>' . __( 'Who we are' ) . '</h2>'; '<h2>' . __( 'Who we are' ) . '</h2>';
$descr && $content .= $descr && $content .=
'<p class="privacy-policy-tutorial">' . __( 'In this section you should note your site URL, as well as the name of the company, organization, or individual behind it, and some accurate contact information.' ) . '</p>' . '<p class="privacy-policy-tutorial">' . __( 'In this section you should note your site URL, as well as the name of the company, organization, or individual behind it, and some accurate contact information.' ) . '</p>' .
@ -1807,8 +1809,7 @@ final class WP_Privacy_Policy_Content {
$content .= $content .=
'<h3>' . __( 'Industry regulatory disclosure requirements' ) . '</h3>'; '<h3>' . __( 'Industry regulatory disclosure requirements' ) . '</h3>';
$descr && $content .= $descr && $content .=
'<p class="privacy-policy-tutorial">' . __( 'If you are a member of a regulated industry, or if you are subject to additional privacy laws, you may be required to disclose that information here.' ) . '</p>'; '<p class="privacy-policy-tutorial">' . __( 'If you are a member of a regulated industry, or if you are subject to additional privacy laws, you may be required to disclose that information here.' ) . '</p>' .
$content .=
'</div>'; '</div>';
// End of the suggested privacy policy text. // End of the suggested privacy policy text.

View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.0-alpha-43238'; $wp_version = '5.0-alpha-43242';
/** /**
* 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.