From f055261a05b3438cd1a9ec7efa23d74c0bed72fa Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 4 May 2018 01:56:22 +0000 Subject: [PATCH] Privacy: Remove stray closing tag in `WP_Privacy_Policy_Content::get_default_content()`, fix typo in `@return` tag. Props dlh, tobifjellner. Fixes #43951. Built from https://develop.svn.wordpress.org/trunk@43170 git-svn-id: http://core.svn.wordpress.org/trunk@42999 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/misc.php | 4 ++-- wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php index df307e4e79..8b52f8d3a8 100644 --- a/wp-admin/includes/misc.php +++ b/wp-admin/includes/misc.php @@ -1635,7 +1635,7 @@ final class WP_Privacy_Policy_Content { * * @since 4.9.6 * - * @return string The defauld policy content. + * @return string The default policy content. */ public static function get_default_content() { // Start of the suggested privacy policy text. @@ -1705,7 +1705,7 @@ final class WP_Privacy_Policy_Content { '

' . __( '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.' ) . '

' . '

' . __( 'Additional information' ) . '

' . - '

' . __( '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.

' ) . '

' . + '

' . __( '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.' ) . '

' . '

' . __( 'How we protect your data' ) . '

' . '

' . __( 'In this section you should explain what measures you have taken to protect your users’ 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.' ) . '

' . diff --git a/wp-includes/version.php b/wp-includes/version.php index 4220c5b216..496fed23a6 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-43168'; +$wp_version = '5.0-alpha-43170'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.