<!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>[43243] trunk/src/wp-admin/includes/upgrade.php: Privacy: make creating a privacy policy page on install multisite compatible.</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/43243">43243</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/43243","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-05-11 15:43:36 +0000 (Fri, 11 May 2018)</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: make creating a privacy policy page on install multisite compatible.
See <a href="https://core.trac.wordpress.org/ticket/43491">#43491</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2018-05-11 15:07:00 UTC (rev 43242)
+++ trunk/src/wp-admin/includes/upgrade.php 2018-05-11 15:43:36 UTC (rev 43243)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,42 +308,50 @@
</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"> // Privacy Policy page
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
- include_once( ABSPATH . 'wp-admin/includes/misc.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() ) {
+ // Disable by default unless the suggested content is provided.
+ $privacy_policy_content = get_site_option( 'default_privacy_policy_content' );
+ } else {
+ if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
+ include_once( ABSPATH . 'wp-admin/includes/misc.php' );
+ }
+
+ $privacy_policy_content = WP_Privacy_Policy_Content::get_default_content();
</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">- $privacy_policy_content = WP_Privacy_Policy_Content::get_default_content();
- $privacy_policy_guid = get_option( 'home' ) . '/?page_id=3';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $privacy_policy_content ) ) {
+ $privacy_policy_guid = get_option( 'home' ) . '/?page_id=3';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wpdb->insert(
- $wpdb->posts, array(
- 'post_author' => $user_id,
- 'post_date' => $now,
- 'post_date_gmt' => $now_gmt,
- 'post_content' => $privacy_policy_content,
- 'post_excerpt' => '',
- 'comment_status' => 'closed',
- 'post_title' => __( 'Privacy Policy' ),
- /* translators: Privacy Policy page slug */
- 'post_name' => __( 'privacy-policy' ),
- 'post_modified' => $now,
- 'post_modified_gmt' => $now_gmt,
- 'guid' => $privacy_policy_guid,
- 'post_type' => 'page',
- 'post_status' => 'draft',
- 'to_ping' => '',
- 'pinged' => '',
- 'post_content_filtered' => '',
- )
- );
- $wpdb->insert(
- $wpdb->postmeta, array(
- 'post_id' => 3,
- 'meta_key' => '_wp_page_template',
- 'meta_value' => 'default',
- )
- );
- update_option( 'wp_page_for_privacy_policy', 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wpdb->insert(
+ $wpdb->posts, array(
+ 'post_author' => $user_id,
+ 'post_date' => $now,
+ 'post_date_gmt' => $now_gmt,
+ 'post_content' => $privacy_policy_content,
+ 'post_excerpt' => '',
+ 'comment_status' => 'closed',
+ 'post_title' => __( 'Privacy Policy' ),
+ /* translators: Privacy Policy page slug */
+ 'post_name' => __( 'privacy-policy' ),
+ 'post_modified' => $now,
+ 'post_modified_gmt' => $now_gmt,
+ 'guid' => $privacy_policy_guid,
+ 'post_type' => 'page',
+ 'post_status' => 'draft',
+ 'to_ping' => '',
+ 'pinged' => '',
+ 'post_content_filtered' => '',
+ )
+ );
+ $wpdb->insert(
+ $wpdb->postmeta, array(
+ 'post_id' => 3,
+ 'meta_key' => '_wp_page_template',
+ 'meta_value' => 'default',
+ )
+ );
+ update_option( 'wp_page_for_privacy_policy', 3 );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up default widgets for default theme.
</span><span class="cx" style="display: block; padding: 0 10px"> update_option(
</span></span></pre>
</div>
</div>
</body>
</html>