WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Privacy: Remove stray closing tag in `WP_Privacy_Policy_Content::get_default_content()`, fix typo in `@return` tag. 

Props dlh, tobifjellner.
Merges [43170] to the 4.9 branch.
Fixes #43951.
Built from https://develop.svn.wordpress.org/branches/4.9@43171


git-svn-id: http://core.svn.wordpress.org/branches/4.9@43000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2018-05-04 01:57:26 +00:00
parent a86c8727b6
commit deeee40510
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1586,7 +1586,7 @@ final class WP_Privacy_Policy_Content {
* *
* @since 4.9.6 * @since 4.9.6
* *
* @return string The defauld policy content. * @return string The default policy content.
*/ */
public static function get_default_content() { public static function get_default_content() {
// Start of the suggested privacy policy text. // Start of the suggested privacy policy text.
@ -1656,7 +1656,7 @@ final class WP_Privacy_Policy_Content {
'<p class="wp-policy-help">' . __( 'In this section you should provide a contact method for privacy-specific concerns. If you are required to have a Data Protection Officer, list their name and full contact details here as well.' ) . '</p>' . '<p class="wp-policy-help">' . __( 'In this section you should provide a contact method for privacy-specific concerns. If you are required to have a Data Protection Officer, list their name and full contact details here as well.' ) . '</p>' .
'<h2>' . __( 'Additional information' ) . '</h2>' . '<h2>' . __( 'Additional information' ) . '</h2>' .
'<p class="wp-policy-help">' . __( 'If you use your website for commercial purposes and you engage in more complex collection or processing of personal data, you should note the following information in your privacy notice in addition to the information we have already discussed.</p>' ) . '</p>' . '<p class="wp-policy-help">' . __( 'If you use your website for commercial purposes and you engage in more complex collection or processing of personal data, you should note the following information in your privacy notice in addition to the information we have already discussed.' ) . '</p>' .
'<h3>' . __( 'How we protect your data' ) . '</h3>' . '<h3>' . __( 'How we protect your data' ) . '</h3>' .
'<p class="wp-policy-help">' . __( 'In this section you should explain what measures you have taken to protect your users&#8217; data. This could include technical measures such as encryption; security measures such as 2FA; and human measures such as staff training in data protection. If you have carried out a Privacy Impact Assessment, you can mention it here too.' ) . '</p>' . '<p class="wp-policy-help">' . __( 'In this section you should explain what measures you have taken to protect your users&#8217; data. This could include technical measures such as encryption; security measures such as 2FA; and human measures such as staff training in data protection. If you have carried out a Privacy Impact Assessment, you can mention it here too.' ) . '</p>' .

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9.6-beta1-43169'; $wp_version = '4.9.6-beta1-43171';
/** /**
* 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.