Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Privacy: exclude the wrapper from the default policy content.

Browse Source 
Props azaozz.
Merges [43242] to the 4.9 branch.
Fixes #44048.
Built from https://develop.svn.wordpress.org/branches/4.9@43255


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43084 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-05-14 14:07:24 +00:00
parent eb592352b5
commit 6e76869056
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1642,10 +1642,12 @@ final class WP_Privacy_Policy_Content {
*/
public static function get_default_content( $descr = false ) {
$suggested_text = $descr ? '<strong class="privacy-policy-tutorial">' . __( 'Suggested text:' ) . ' </strong>' : '';
$content = '';
// Start of the suggested privacy policy text.
$content =
'<div class="wp-suggested-text">' .
$descr && $content .=
'<div class="wp-suggested-text">';
$content .=
'<h2>' . __( 'Who we are' ) . '</h2>';
$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>' .
@ -1758,8 +1760,7 @@ final class WP_Privacy_Policy_Content {
$content .=
'<h3>' . __( 'Industry regulatory disclosure requirements' ) . '</h3>';
$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>';
$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>' .
'</div>';
// End of the suggested privacy policy text.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9.6-RC1-43254';
$wp_version = '4.9.6-RC1-43255';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.