<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[57741] trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php: Privacy: Update default privacy page content to use latest block markup.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/57741">57741</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/57741","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-02-29 12:15:43 +0000 (Thu, 29 Feb 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Privacy: Update default privacy page content to use latest block markup.
Avoids {U+201C}Updated Block{U+201D} warnings being logged to the console.
Props 254volkan, swissspidy.
Fixes <a href="https://core.trac.wordpress.org/ticket/60530">#60530</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpprivacypolicycontentphp">trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpprivacypolicycontentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2024-02-29 10:15:20 UTC (rev 57740)
+++ trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2024-02-29 12:15:43 UTC (rev 57741)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +466,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<h2>' . __( 'Who we are' ) . '</h2>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<h2 class="wp-block-heading">' . __( 'Who we are' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,7 +494,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<h2>' . __( 'Comments' ) . '</h2>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<h2 class="wp-block-heading">' . __( 'Comments' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -507,7 +507,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<h2>' . __( 'Media' ) . '</h2>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<h2 class="wp-block-heading">' . __( 'Media' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,7 +525,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<h2>' . __( 'Cookies' ) . '</h2>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<h2 class="wp-block-heading">' . __( 'Cookies' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,7 +543,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<h2>' . __( 'Embedded content from other websites' ) . '</h2>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<h2 class="wp-block-heading">' . __( 'Embedded content from other websites' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy text. */
</span><span class="cx" style="display: block; padding: 0 10px"> $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>';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy text. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,7 +560,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<h2>' . __( 'Who we share your data with' ) . '</h2>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<h2 class="wp-block-heading">' . __( 'Who we share your data with' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -573,7 +573,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<h2>' . __( 'How long we retain your data' ) . '</h2>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<h2 class="wp-block-heading">' . __( 'How long we retain your data' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,7 +586,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<h2>' . __( 'What rights you have over your data' ) . '</h2>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<h2 class="wp-block-heading">' . __( 'What rights you have over your data' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,7 +597,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default privacy policy heading. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[] = '<h2>' . __( 'Where your data is sent' ) . '</h2>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[] = '<h2 class="wp-block-heading">' . __( 'Where your data is sent' ) . '</h2>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $description ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Privacy policy tutorial. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -662,11 +662,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $blocks ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $strings as $key => $string ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( str_starts_with( $string, '<p>' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $strings[ $key ] = '<!-- wp:paragraph -->' . $string . '<!-- /wp:paragraph -->';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $strings[ $key ] = "<!-- wp:paragraph -->\n" . $string . "\n<!-- /wp:paragraph -->\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( str_starts_with( $string, '<h2>' ) ) {
- $strings[ $key ] = '<!-- wp:heading -->' . $string . '<!-- /wp:heading -->';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_starts_with( $string, '<h2 ' ) ) {
+ $strings[ $key ] = "<!-- wp:heading -->\n" . $string . "\n<!-- /wp:heading -->\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>