From 2cf42cec664485a455a7a313b5e5515fe5fce352 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascal.birchler@gmail.com>
Date: Thu, 29 Feb 2024 12:17:08 +0000
Subject: [PATCH] Privacy: Update default privacy page content to use latest
 block markup.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Avoids “Updated Block” warnings being logged to the console.

Props 254volkan, swissspidy.
Fixes #60530.
Built from https://develop.svn.wordpress.org/trunk@57741


git-svn-id: http://core.svn.wordpress.org/trunk@57242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../class-wp-privacy-policy-content.php       | 24 +++++++++----------
 wp-includes/version.php                       |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/wp-admin/includes/class-wp-privacy-policy-content.php b/wp-admin/includes/class-wp-privacy-policy-content.php
index d676875932..e0775f7bea 100644
--- a/wp-admin/includes/class-wp-privacy-policy-content.php
+++ b/wp-admin/includes/class-wp-privacy-policy-content.php
@@ -466,7 +466,7 @@ final class WP_Privacy_Policy_Content {
 		}
 
 		/* translators: Default privacy policy heading. */
-		$strings[] = '<h2>' . __( 'Who we are' ) . '</h2>';
+		$strings[] = '<h2 class="wp-block-heading">' . __( 'Who we are' ) . '</h2>';
 
 		if ( $description ) {
 			/* translators: Privacy policy tutorial. */
@@ -494,7 +494,7 @@ final class WP_Privacy_Policy_Content {
 		}
 
 		/* translators: Default privacy policy heading. */
-		$strings[] = '<h2>' . __( 'Comments' ) . '</h2>';
+		$strings[] = '<h2 class="wp-block-heading">' . __( 'Comments' ) . '</h2>';
 
 		if ( $description ) {
 			/* translators: Privacy policy tutorial. */
@@ -507,7 +507,7 @@ final class WP_Privacy_Policy_Content {
 		}
 
 		/* translators: Default privacy policy heading. */
-		$strings[] = '<h2>' . __( 'Media' ) . '</h2>';
+		$strings[] = '<h2 class="wp-block-heading">' . __( 'Media' ) . '</h2>';
 
 		if ( $description ) {
 			/* translators: Privacy policy tutorial. */
@@ -525,7 +525,7 @@ final class WP_Privacy_Policy_Content {
 		}
 
 		/* translators: Default privacy policy heading. */
-		$strings[] = '<h2>' . __( 'Cookies' ) . '</h2>';
+		$strings[] = '<h2 class="wp-block-heading">' . __( 'Cookies' ) . '</h2>';
 
 		if ( $description ) {
 			/* translators: Privacy policy tutorial. */
@@ -543,7 +543,7 @@ final class WP_Privacy_Policy_Content {
 
 		if ( ! $description ) {
 			/* translators: Default privacy policy heading. */
-			$strings[] = '<h2>' . __( 'Embedded content from other websites' ) . '</h2>';
+			$strings[] = '<h2 class="wp-block-heading">' . __( 'Embedded content from other websites' ) . '</h2>';
 			/* translators: Default privacy policy text. */
 			$strings[] = '<p>' . $suggested_text . __( 'Articles on this site may include embedded content (e.g. videos, images, articles, etc.). Embedded content from other websites behaves in the exact same way as if the visitor has visited the other website.' ) . '</p>';
 			/* translators: Default privacy policy text. */
@@ -560,7 +560,7 @@ final class WP_Privacy_Policy_Content {
 		}
 
 		/* translators: Default privacy policy heading. */
-		$strings[] = '<h2>' . __( 'Who we share your data with' ) . '</h2>';
+		$strings[] = '<h2 class="wp-block-heading">' . __( 'Who we share your data with' ) . '</h2>';
 
 		if ( $description ) {
 			/* translators: Privacy policy tutorial. */
@@ -573,7 +573,7 @@ final class WP_Privacy_Policy_Content {
 		}
 
 		/* translators: Default privacy policy heading. */
-		$strings[] = '<h2>' . __( 'How long we retain your data' ) . '</h2>';
+		$strings[] = '<h2 class="wp-block-heading">' . __( 'How long we retain your data' ) . '</h2>';
 
 		if ( $description ) {
 			/* translators: Privacy policy tutorial. */
@@ -586,7 +586,7 @@ final class WP_Privacy_Policy_Content {
 		}
 
 		/* translators: Default privacy policy heading. */
-		$strings[] = '<h2>' . __( 'What rights you have over your data' ) . '</h2>';
+		$strings[] = '<h2 class="wp-block-heading">' . __( 'What rights you have over your data' ) . '</h2>';
 
 		if ( $description ) {
 			/* translators: Privacy policy tutorial. */
@@ -597,7 +597,7 @@ final class WP_Privacy_Policy_Content {
 		}
 
 		/* translators: Default privacy policy heading. */
-		$strings[] = '<h2>' . __( 'Where your data is sent' ) . '</h2>';
+		$strings[] = '<h2 class="wp-block-heading">' . __( 'Where your data is sent' ) . '</h2>';
 
 		if ( $description ) {
 			/* translators: Privacy policy tutorial. */
@@ -662,11 +662,11 @@ final class WP_Privacy_Policy_Content {
 		if ( $blocks ) {
 			foreach ( $strings as $key => $string ) {
 				if ( str_starts_with( $string, '<p>' ) ) {
-					$strings[ $key ] = '<!-- wp:paragraph -->' . $string . '<!-- /wp:paragraph -->';
+					$strings[ $key ] = "<!-- wp:paragraph -->\n" . $string . "\n<!-- /wp:paragraph -->\n";
 				}
 
-				if ( str_starts_with( $string, '<h2>' ) ) {
-					$strings[ $key ] = '<!-- wp:heading -->' . $string . '<!-- /wp:heading -->';
+				if ( str_starts_with( $string, '<h2 ' ) ) {
+					$strings[ $key ] = "<!-- wp:heading -->\n" . $string . "\n<!-- /wp:heading -->\n";
 				}
 			}
 		}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 137afb5c67..536ca609af 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.5-beta3-57740';
+$wp_version = '6.5-beta3-57741';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.