<!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>[43184] trunk/src/wp-admin: Privacy: outputting the privacy policy guide and suggested content to a new page instead of a postbox.</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/43184">43184</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/43184","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-08 23:44:57 +0000 (Tue, 08 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: outputting the privacy policy guide and suggested content to a new page instead of a postbox.
Props melchoyce, azaozz.
See <a href="https://core.trac.wordpress.org/ticket/43980">#43980</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsseditcss">trunk/src/wp-admin/css/edit.css</a></li>
<li><a href="#trunksrcwpadminincludesadminfiltersphp">trunk/src/wp-admin/includes/admin-filters.php</a></li>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpadminjspostjs">trunk/src/wp-admin/js/post.js</a></li>
<li><a href="#trunksrcwpadminjsxfnjs">trunk/src/wp-admin/js/xfn.js</a></li>
<li><a href="#trunksrcwpadminprivacyphp">trunk/src/wp-admin/privacy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsseditcss"></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/css/edit.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/edit.css 2018-05-08 23:28:47 UTC (rev 43183)
+++ trunk/src/wp-admin/css/edit.css 2018-05-08 23:44:57 UTC (rev 43184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -646,36 +646,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 20px;
</span><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">-/* Sugested text for privacy policy postbox */
-.privacy-text-box {
- margin: 10px 0 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Suggested text for privacy policy */
+.wp-suggested-policy-content {
+ max-width: 1000px;
</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-text-box-head {
- border-left: 4px solid #ffb900;
- border-bottom: 1px solid #e5e5e5;
- box-shadow: 0 1px 1px rgba(0,0,0,0.04);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-text-box {
+ width: calc(100% - 260px);
</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-text-box .privacy-text-box-head.hndle {
- cursor: pointer;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-text-box-toc {
+ float: right;
+ width: 250px;
+ background-color: #fff;
</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-text-box-head p {
- padding: 0 12px 14px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-text-box-toc p {
</ins><span class="cx" style="display: block; padding: 0 10px"> margin: 0;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 0.7em 1em;
+ border-bottom: 1px solid #eee;
</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-text-box-body {
- height: 320px;
- overflow: auto;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-text-box-toc ol {
+ margin-left: 2em;
</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-text-box .inside {
- margin: 0;
-}
-
-.privacy-text-box h3 {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-suggested-policy-content h3 {
</ins><span class="cx" style="display: block; padding: 0 10px"> font-size: 1em;
</span><span class="cx" style="display: block; padding: 0 10px"> margin: 1em 0 0.5em;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -686,36 +682,29 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .privacy-text-section {
</span><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- padding: 1px 14px 1px 12px;
</del><span class="cx" style="display: block; padding: 0 10px"> border-top: 1px solid #e3e3e3;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border-left: 4px solid transparent;
</del><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-text-section.text-updated {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border-left-color: #46b450;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 1px 15px;
+ border-left: 4px solid #46b450;
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #ecf7ed;
</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-text-section.text-removed {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- border-left-color: #dc3232;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 1px 14px 1px 12px;
+ border-left: 4px solid #dc3232;
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #fbeaea;
</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-text-meta {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- font-size: 11px;
- color: #555D66;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ font-size: 11px;
+ font-style: italic;
+ color: #6C7781;
</ins><span class="cx" style="display: block; padding: 0 10px"> font-weight: 600;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin-top: -12px;
</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">-.closed .privacy-text-box-body {
- display: none;
-}
-
-.privacy-text-section.folded {
- height: 150px;
- overflow: hidden;
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> .privacy-text-actions {
</span><span class="cx" style="display: block; padding: 0 10px"> height: 32px;
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 32px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -722,41 +711,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding-bottom: 6px;
</span><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">-.folded .privacy-text-actions {
- position: absolute;
- bottom: 0;
- background-color: white;
- width: calc(100% - 24px);
- box-shadow: 0px -5px 10px 5px rgba(255, 255, 255, .8);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-suggested-policy-content .policy-text h2 {
+ margin: 1.2em 0 1em;
+ padding: 0;
</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">-.text-removed .privacy-text-actions {
- background-color: #fbeaea;
- box-shadow: 0px -5px 10px 5px rgba(251, 234, 234, .8);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.suggested-policy-content {
+ font-style: italic;
</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">-.text-updated .privacy-text-actions {
- background-color: #ecf7ed;
- box-shadow: 0px -5px 10px 5px rgba(236, 247, 237, .8);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.privacy-text-section a.return-to-top {
+ float: right;
+ margin-right: -250px;
+ margin-top: 6px;
</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">-.policy-text-more,
-.folded .privacy-text-copy,
-.folded .policy-text-less {
- display: none;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.hide-privacy-policy-tutorial .privacy-policy-tutorial {
+ visibility: hidden;
</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">-.folded .policy-text-more {
- display: inline;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-suggested-text p {
+ font-style: italic;
</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-text-box .policy-text h2 {
- margin: 1.2em 0 1em;
- padding: 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-suggested-text p.privacy-policy-tutorial {
+ font-style: normal;
</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">-p.wp-policy-help {
- display: none;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.notice.wp-pp-notice {
+ margin: 15px 0 3px;
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1683,4 +1666,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .links-table td {
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 10px 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ .privacy-text-box {
+ width: auto;
+ }
+
+ .privacy-text-box-toc {
+ float: none;
+ width: auto;
+ }
+
+ .privacy-text-section a.return-to-top {
+ float: none;
+ margin: 0;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesadminfiltersphp"></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/admin-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/admin-filters.php 2018-05-08 23:28:47 UTC (rev 43183)
+++ trunk/src/wp-admin/includes/admin-filters.php 2018-05-08 23:44:57 UTC (rev 43184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,10 +140,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'text_change_check' ), 20 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Show a "postbox" with the text suggestions for a privacy policy.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'edit_form_after_title', array( 'WP_Privacy_Policy_Content', 'privacy_policy_postbox' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'edit_form_after_title', array( 'WP_Privacy_Policy_Content', 'notice' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the suggested policy text from WordPress.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'add_suggested_content' ), 15 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'add_suggested_content' ), 1 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Stop checking for text changes after the policy page is updated.
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'post_updated', array( 'WP_Privacy_Policy_Content', '_policy_page_updated' ) );
</span></span></pre></div>
<a id="trunksrcwpadminincludesmiscphp"></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/misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/misc.php 2018-05-08 23:28:47 UTC (rev 43183)
+++ trunk/src/wp-admin/includes/misc.php 2018-05-08 23:44:57 UTC (rev 43184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1443,12 +1443,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_suggested_policy_text() {
</span><span class="cx" style="display: block; padding: 0 10px"> $policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $new = self::$policy_content;
- $old = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
</del><span class="cx" style="display: block; padding: 0 10px"> $checked = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $time = time();
</span><span class="cx" style="display: block; padding: 0 10px"> $update_cache = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new = self::$policy_content;
+ $old = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $policy_page_id ) {
+ $old = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check for no-changes and updates.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $new as $new_key => $new_data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $old as $old_key => $old_data ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1513,7 +1517,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $update_cache = true;
</span><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 ( $update_cache ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $update_cache && $policy_page_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
</span><span class="cx" style="display: block; padding: 0 10px"> // Update the cache.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $checked as $data ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1521,8 +1525,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Stop checking for changes after the postbox has been loaded.
- // TODO make this user removable?
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Stop checking for changes after the page has been loaded.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( get_option( '_wp_privacy_text_change_check' ) !== 'no-check' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( '_wp_privacy_text_change_check', 'no-check' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1531,13 +1534,13 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Output the postbox when editing the privacy policy page
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Add a notice with a link to the guide when editing the privacy policy page.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.9.6
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $post WP_Post The currently edited post.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public static function privacy_policy_postbox( $post ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public static function notice( $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! ( $post instanceof WP_Post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1548,14 +1551,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ <div class="notice notice-warning inline wp-pp-notice">
+ <p>
+ <?php
+ printf(
+ __( 'Need help putting together your new Privacy Policy page? %s for recommendations on what content to include, along with policies suggested by your plugins and theme.' ),
+ '<a href="' . admin_url( 'privacy.php?wp-suggested-policy-content=1' ) . '" target="_blank">' . __( 'Check out our guide' ) . '</a>' );
+ ?>
+ </p>
+ </div>
+ <?php
+
+ }
+
+ /**
+ * Output the privacy policy guide together with content from the theme and plugins.
+ *
+ * @since 4.9.6
+ */
+ public static function privacy_policy_guide() {
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_array = self::get_suggested_policy_text();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content = '';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $toc = array( '<li><a href="#">' . __( 'Introduction' ) . '</a></li>' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $date_format = get_option( 'date_format' );
</span><span class="cx" style="display: block; padding: 0 10px"> $copy = __( 'Copy' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $more = __( 'Read More' );
- $less = __( 'Read Less' );
- $folded = ( count( $content_array ) > 1 ) ? ' folded' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $return_to_top = '<a href="#" class="return-to-top">' . __( '↑ Return to Top' ) . '</a>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $content_array as $section ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class = $meta = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1563,64 +1586,60 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $section['removed'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class = ' text-removed';
</span><span class="cx" style="display: block; padding: 0 10px"> $date = date_i18n( $date_format, $section['removed'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = sprintf( __( 'Policy text removed %s.' ), $date );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = sprintf( __( 'Removed %s.' ), $date );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $section['updated'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class = ' text-updated';
</span><span class="cx" style="display: block; padding: 0 10px"> $date = date_i18n( $date_format, $section['updated'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = sprintf( __( 'Policy text last updated %s.' ), $date );
- } elseif ( ! empty( $section['added'] ) ) {
- $class = ' text-added';
- $date = date_i18n( $date_format, $section['added'] );
- $meta = sprintf( __( 'Policy text added %s.' ), $date );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = sprintf( __( 'Updated %s.' ), $date );
</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">- $plugin_name = esc_html( $section['plugin_name'] );
-
- $content .= '<div class="privacy-text-section' . $folded . $class . '">';
- $content .= '<h3>' . $plugin_name . '</h3>';
-
- if ( ! empty( $meta ) ) {
- $content .= '<span class="privacy-text-meta">' . $meta . '</span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $meta ) {
+ $meta = '<br><span class="privacy-text-meta">' . $meta . '</span>';
</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">- $content .= '<div class="policy-text" aria-expanded="false">' . $section['policy_text'] . '</div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugin_name = esc_html( $section['plugin_name'] );
+ $toc_id = sanitize_title( $plugin_name );
+ $toc[] = sprintf( '<li><a href="#%1$s">%2$s</a>' . $meta . '</li>', $toc_id, $plugin_name );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content .= '<div class="privacy-text-actions">';
- if ( $folded ) {
- $content .= '<button type="button" class="button-link policy-text-more">';
- $content .= $more;
- $content .= '<span class="screen-reader-text">' . sprintf( __( 'Expand suggested policy text section from %s.' ), $plugin_name ) . '</span>';
- $content .= '</button>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content .= '<div class="privacy-text-section' . $class . '">';
+ $content .= '<h2>' . sprintf( __( 'Source: %s' ), $plugin_name ) . '</h2>';
+ $content .= '<a id="' . $toc_id . '"></a>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content .= '<button type="button" class="button-link policy-text-less">';
- $content .= $less;
- $content .= '<span class="screen-reader-text">' . sprintf( __( 'Collapse suggested policy text section from %s.' ), $plugin_name ) . '</span>';
- $content .= '</button>';
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content .= '<div class="policy-text">' . $section['policy_text'] . '</div>';
+ $content .= $return_to_top;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $section['removed'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $section['removed'] ) ) {
+ $content .= '<div class="privacy-text-actions">';
</ins><span class="cx" style="display: block; padding: 0 10px"> $content .= '<button type="button" class="privacy-text-copy button">';
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= $copy;
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= '<span class="screen-reader-text">' . sprintf( __( 'Copy suggested policy text from %s.' ), $plugin_name ) . '</span>';
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= '</button>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content .= '</div>';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content .= '</div>'; // End of .privacy-text-actions.
</del><span class="cx" style="display: block; padding: 0 10px"> $content .= "</div>\n"; // End of .privacy-text-section.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( count( $toc ) > 2 ) {
+ ?>
+ <div class="privacy-text-box-toc">
+ <p><?php _e( 'Table of Contents' ); ?></p>
+ <ol>
+ <?php echo implode( "\n", $toc ); ?>
+ </ol>
+ </div>
+ <?php
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="privacy-text-box" class="privacy-text-box postbox <?php echo postbox_classes( 'privacy-text-box', 'page' ); ?>">
- <button type="button" class="handlediv" aria-expanded="true">
- <span class="screen-reader-text"><?php _e( 'Toggle panel: Suggested privacy policy text' ); ?></span>
- <span class="toggle-indicator" aria-hidden="true"></span>
- </button>
- <div class="privacy-text-box-head hndle">
- <h2><?php _e( 'This suggested privacy policy text comes from plugins and themes you have installed.' ); ?></h2>
- <p>
- <?php _e( 'We suggest reviewing this text then copying and pasting it into your privacy policy page.' ); ?>
- <?php _e( 'Please remember you are responsible for the policies you choose to adopt, so review the content and make any necessary edits.' ); ?>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="privacy-text-box">
+ <div class="privacy-text-box-head">
+ <h2><?php _e( 'Introduction' ); ?></h2>
+ <p><?php _e( 'Hello,' ); ?></p>
+ <p><?php _e( 'This text template will help you to create your web site’s privacy policy.' ); ?></p>
+ <p><?php _e( 'We have suggested the sections you will need. Under each section heading you will find a short summary of what information you should provide, which will help you to get started. Some sections include suggested policy content, others will have to be completed with information from your theme and plugins.' ); ?></p>
+ <p><?php _e( 'Please edit your privacy policy content, making sure to delete the summaries, and adding any information from your theme and plugins. Once you publish your policy page, remember to add it to your navigation menu.' ); ?></p>
+ <p><?php _e( 'It is your responsibility to write a comprehensive privacy policy, to make sure it reflects all national and international legal requirements on privacy, and to keep your policy current and accurate.' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="privacy-text-box-body">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1638,90 +1657,92 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The default policy content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_default_content() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $suggested_text = '<strong class="privacy-policy-tutorial">' . __( 'Suggested text:' ) . ' </strong>';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Start of the suggested privacy policy text.
</span><span class="cx" style="display: block; padding: 0 10px"> $content =
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( 'Hello,' ) . '</p>' .
- '<p class="wp-policy-help">' . __( 'This text template will help you to create your website’s privacy policy.' ) . '</p>' .
- '<p class="wp-policy-help">' . __( 'We have suggested the sections you will need. Under each section heading you will find a short summary of what information you should provide, which will help you to get started.' ) . '</p>' .
- '<p class="wp-policy-help">' . __( 'Please edit your privacy policy content, making sure to delete the summaries, and adding any information from your themes and plugins. Once you publish your policy page, remember to add it to your navigation menu.' ) . '</p>' .
- '<p class="wp-policy-help">' . __( 'It is your responsibility to write a comprehensive privacy policy, to make sure it reflects all national and international legal requirements on privacy, and to keep your policy current and accurate.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<div class="wp-suggested-text">' .
+ '<h2>' . __( 'Who we are' ) . '</h2>' .
+ '<p class="privacy-policy-tutorial">' . __( 'In this section you should note your site URL, as well as the name of the company, organization, or individual behind it, and some accurate contact information.' ) . '</p>' .
+ '<p class="privacy-policy-tutorial">' . __( 'The amount of information you may be required to show will vary depending on your local or national business regulations. You may, for example, be required to display a physical address, a registered address, or your company registration number.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h2>' . __( 'Who we are' ) . '</h2>' .
- '<p class="wp-policy-help">' . __( 'In this section you should note your site URL, as well as the name of the company, organization, or individual behind it, and some accurate contact information.' ) . '</p>' .
- '<p class="wp-policy-help">' . __( 'The amount of information you may be required to show will vary depending on your local or national business regulations. You may, for example, be required to display a physical address, a registered address, or your company registration number.' ) . '</p>' .
</del><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s Site URL */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . $suggested_text . sprintf( __( 'Our website address is: %s.' ), get_bloginfo( 'url', 'display' ) ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' . __( 'What personal data we collect and why we collect it' ) . '</h2>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( 'In this section you should note what personal data you collect from users and site visitors. This may include transactional data, such as purchase information; technical data, such as information about cookies; and personal data, such as user account information.' ) . '</p>' .
- '<p class="wp-policy-help">' . __( 'You must also note any collection and retention of sensitive personal data, such as data concerning health.' ) . '</p>' .
- '<p class="wp-policy-help">' . __( 'In addition to listing what personal data you collect, you need to note why you collect it. These explanations must note either the legal basis for your data collection and retention or the active consent the user has given.' ) . '</p>' .
- '<p class="wp-policy-help">' . __( 'Personal data is not just created by a user’s interactions with your site. Personal data is also generated from technical processes such as contact forms, comments, cookies, analytics, and third party embeds.' ) . '</p>' .
- '<p class="wp-policy-help">' . __( 'By default WordPress does not collect any personal data about visitors, and only collects the data shown on the User Profile screen for registered users. However, some of your plugins may also collect personal data, add the relevant information below.' ) . '</p>' .
- '<p>' . __( 'If you are a registered user and upload images to the website, you should avoid uploading images with EXIF GPS location data included. Visitors to the website can download and extract any location data from images on the website.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( 'In this section you should note what personal data you collect from users and site visitors. This may include personal data, such as name, email address, personal account preferences; transactional data, such as purchase information; and technical data, such as information about cookies.' ) . '</p>' .
+ '<p class="privacy-policy-tutorial">' . __( 'You should also note any collection and retention of sensitive personal data, such as data concerning health.' ) . '</p>' .
+ '<p class="privacy-policy-tutorial">' . __( 'In addition to listing what personal data you collect, you need to note why you collect it. These explanations must note either the legal basis for your data collection and retention or the active consent the user has given.' ) . '</p>' .
+ '<p class="privacy-policy-tutorial">' . __( 'Personal data is not just created by a user’s interactions with your site. Personal data is also generated from technical processes such as contact forms, comments, cookies, analytics, and third party embeds.' ) . '</p>' .
+ '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any personal data about visitors, and only collects the data shown on the User Profile screen from registered users. However some of your plugins may collect personal data. You should add the relevant information below.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<h3>' . __( 'Contact forms' ) . '</h3>' .
- '<p class="wp-policy-help">' . __( 'By default, WordPress does not include a contact form. If you use a contact form plugin, use this subsection to note what personal data is captured when someone submits a contact form, and how long you keep it. For example, you may note that you keep contact form submissions for a certain period for customer service purposes, but you do not use the information submitted through them for marketing purposes.' ) . '</p>' .
-
</del><span class="cx" style="display: block; padding: 0 10px"> '<h3>' . __( 'Comments' ) . '</h3>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( 'In this subsection you should note what information is captured through comments.' ) . '</p>' .
- '<p>' . __( 'When visitors leave comments on the website we collect the data shown in the comments form, and also the visitor’s IP address and browser user agent string to help spam detection.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information is captured through comments. We have noted the data which WordPress collects by default.' ) . '</p>' .
+ '<p>' . $suggested_text . __( 'When visitors leave comments on the site we collect the data shown in the comments form, and also the visitor’s IP address and browser user agent string to help spam detection.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'An anonymized string created from your email address (also called a hash) may be provided to the Gravatar service to see if you are using it. The Gravatar service privacy policy is available here: https://automattic.com/privacy/. After approval of your comment, your profile picture is visible to the public in the context of your comment.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<h3>' . __( 'Media' ) . '</h3>' .
+ '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what information may be disclosed by users who can upload media files. All uploaded files are usually publicly accessible.' ) . '</p>' .
+ '<p>' . $suggested_text . __( 'If you upload images to the website, you should avoid uploading images with embedded location data (EXIF GPS) included. Visitors to the website can download and extract any location data from images on the website.' ) . '</p>' .
+
+ '<h3>' . __( 'Contact forms' ) . '</h3>' .
+ '<p class="privacy-policy-tutorial">' . __( 'By default, WordPress does not include a contact form. If you use a contact form plugin, use this subsection to note what personal data is captured when someone submits a contact form, and how long you keep it. For example, you may note that you keep contact form submissions for a certain period for customer service purposes, but you do not use the information submitted through them for marketing purposes.' ) . '</p>' .
+
</ins><span class="cx" style="display: block; padding: 0 10px"> '<h3>' . __( 'Cookies' ) . '</h3>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( 'In this subsection you should list the cookies your website uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '</p>' .
- '<p>' . __( 'If you leave a comment on our site you may opt in to saving your name, email address, and website in cookies. These are for your convenience so that you do not have to fill in your details again when you leave another comment. These cookies will last for one year.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should list the cookies your web site uses, including those set by your plugins, social media, and analytics. We have provided the cookies which WordPress installs by default.' ) . '</p>' .
+ '<p>' . $suggested_text . __( 'If you leave a comment on our site you may opt-in to saving your name, email address and website in cookies. These are for your convenience so that you do not have to fill in your details again when you leave another comment. These cookies will last for one year.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'If you have an account and you log in to this site, we will set a temporary cookie to determine if your browser accepts cookies. This cookie contains no personal data and is discarded when you close your browser.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'When you log in, we will also set up several cookies to save your login information and your screen display choices. Login cookies last for two days, and screen options cookies last for a year. If you select "Remember Me", your login will persist for two weeks. If you log out of your account, the login cookies will be removed.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'If you edit or publish an article, an additional cookie will be saved in your browser. This cookie includes no personal data and simply indicates the post ID of the article you just edited. It expires after 1 day.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h3>' . __( 'Embedded content from other websites' ) . '</h3>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( '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>' .
- '<p>' . __( 'These websites may collect data about you, use cookies, embed additional third-party tracking, and monitor your interaction with that embedded content, including tracking your interaction with the embedded content if you have an account and are logged in to that website.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<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>' .
+ '<p>' . __( 'These websites may collect data about you, use cookies, embed additional third-party tracking, and monitor your interaction with that embedded content, including tracing your interaction with the embedded content if you have an account and are logged in to that website.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h3>' . __( 'Analytics' ) . '</h3>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( 'In this subsection you should note what analytics package you use, how users can opt out of analytics tracking, and a link to information on how your analytics provider conforms to European data protection law.' ) . '</p>' .
- '<p class="wp-policy-help">' . __( 'By default WordPress does not collect any analytics data. However, many web hosting accounts collect some anonymous analytics data. You may also have installed a WordPress plugin that provides analytics services. In that case, add information from that plugin here.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( 'In this subsection you should note what analytics package you use, how users can opt out of analytics tracking, and a link to your analytics provider’s privacy policy, if any.' ) . '</p>' .
+ '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not collect any analytics data. However, many web hosting accounts collect some anonymous analytics data. You may also have installed a WordPress plugin that provides analytics services. In that case, add information from that plugin here.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' . __( 'Who we share your data with' ) . '</h2>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( 'In this section you should name and list all third party providers with whom you share site data, including partners, cloud-based services, payment processors, and third party service providers, and note what data you share with them and why. Link to their own privacy notices if possible.' ) . '</p>' .
- '<p class="wp-policy-help">' . __( 'By default, WordPress does not share any personal data with anybody.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( 'In this section you should name and list all third party providers with whom you share site data, including partners, cloud-based services, payment processors, and third party service providers, and note what data you share with them and why. Link to their own privacy policies if possible.' ) . '</p>' .
+ '<p class="privacy-policy-tutorial">' . __( 'By default WordPress does not share any personal data with anyone.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' . __( 'How long we retain your data' ) . '</h2>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( 'In this section you should explain how long you retain personal data collected or processed by the website. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '</p>' .
- '<p>' . __( 'If you leave a comment, the comment and its metadata are retained indefinitely. This is so we can recognize and approve any follow-up comments automatically instead of holding them in a moderation queue.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain how long you retain personal data collected or processed by the web site. While it is your responsibility to come up with the schedule of how long you keep each dataset for and why you keep it, that information does need to be listed here. For example, you may want to say that you keep contact form entries for six months, analytics records for a year, and customer purchase records for ten years.' ) . '</p>' .
+ '<p>' . $suggested_text . __( 'If you leave a comment, the comment and its metadata are retained indefinitely. This is so we can recognize and approve any follow-up comments automatically instead of holding them in a moderation queue.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'For users that register on our website (if any), we also store the personal information they provide in their user profile. All users can see, edit, or delete their personal information at any time (except they cannot change their username). Website administrators can also see and edit that information.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' . __( 'What rights you have over your data' ) . '</h2>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( 'In this section you should explain what rights your users have over their data and how they can invoke those rights.' ) . '</p>' .
- '<p>' . __( 'If you have an account or have left comments on this website, you can request to receive an export file of the personal data we hold about you, including any data you have provided to us. You can also request that we delete any personal data we hold about you. This does not include any data we are obliged to keep for administrative, legal, or security purposes.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what rights your users have over their data and how they can invoke those rights.' ) . '</p>' .
+ '<p>' . $suggested_text . __( 'If you have an account on this site, or have left comments, you can request to receive an exported file of the personal data we hold about you, including any data you have provided to us. You can also request that we erase any personal data we hold about you. This does not include any data we are obliged to keep for administrative, legal, or security purposes.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' . __( 'Where we send your data' ) . '</h2>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( 'In this section you should list all transfers of your site data outside the European Union and describe the means by which that data is safeguarded to European data protection standards. This could include your web hosting, cloud storage, or other third party services.' ) . '</p>' .
- '<p class="wp-policy-help">' . __( 'European data protection law requires that data about European residents which is transferred outside the European Union to be safeguarded to the same standards as if the data was in Europe. So in addition to listing where data goes, you should describe how you ensure that these standards are met either by yourself or by your third-party providers, whether that is through an agreement such as Privacy Shield, model clauses in your contracts, or binding corporate rules.' ) . '</p>' .
- '<p>' . __( 'Visitor comments may be checked through an automated spam detection service. This may be located abroad.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( 'In this section you should list all transfers of your site data outside the European Union and describe the means by which that data is safeguarded to European data protection standards. This could include your web hosting, cloud storage, or other third party services.' ) . '</p>' .
+ '<p class="privacy-policy-tutorial">' . __( 'European data protection law requires data about European residents which is transferred outside the European Union to be safeguarded to the same standards as if the data was in Europe. So in addition to listing where data goes, you should describe how you ensure that these standards are met either by yourself or by your third party providers, whether that is through an agreement such as Privacy Shield, model clauses in your contracts, or binding corporate rules.' ) . '</p>' .
+ '<p>' . $suggested_text . __( 'Visitor comments may be checked through an automated spam detection service.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' . __( 'Your contact information' ) . '</h2>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<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>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( '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>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h2>' . __( 'Additional information' ) . '</h2>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<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>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( 'If you use your site for commercial purposes and you engage in more complex collection or processing of personal data, you should note the following information in your privacy policy in addition to the information we have already discussed.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h3>' . __( 'How we protect your data' ) . '</h3>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( '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.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( '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 two factor authentication; and measures such as staff training in data protection. If you have carried out a Privacy Impact Assessment, you can mention it here too.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h3>' . __( 'What data breach procedures we have in place' ) . '</h3>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( 'In this section you should explain what procedures you have in place to deal with data breaches, either potential or real, such as internal reporting systems, contact mechanisms, or bug bounties.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( 'In this section you should explain what procedures you have in place to deal with data breaches, either potential or real, such as internal reporting systems, contact mechanisms, or bug bounties.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h3>' . __( 'What third parties we receive data from' ) . '</h3>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( 'If your website receives data about users from third parties, including advertisers, this information must be included within the section of your privacy notice dealing with third party data.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( 'If your web site receives data about users from third parties, including advertisers, this information must be included within the section of your privacy policy dealing with third party data.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h3>' . __( 'What automated decision making and/or profiling we do with user data' ) . '</h3>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( 'If your website provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( 'If your web site provides a service which includes automated decision making - for example, allowing customers to apply for credit, or aggregating their data into an advertising profile - you must note that this is taking place, and include information about how that information is used, what decisions are made with that aggregated data, and what rights users have over decisions made without human intervention.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> '<h3>' . __( 'Industry regulatory disclosure requirements' ) . '</h3>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p class="wp-policy-help">' . __( 'If you are a member of a regulated industry, or if you are subject to additional privacy laws, you may be required to disclose that information here.' ) . '</p>';
- // End of the suggested policy text.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p class="privacy-policy-tutorial">' . __( 'If you are a member of a regulated industry, or if you are subject to additional privacy laws, you may be required to disclose that information here.' ) . '</p>' .
+ '</div>';
+ // End of the suggested privacy policy text.
</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"> * Filters the default content suggested for inclusion in a privacy policy.
</span></span></pre></div>
<a id="trunksrcwpadminjspostjs"></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/js/post.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/post.js 2018-05-08 23:28:47 UTC (rev 43183)
+++ trunk/src/wp-admin/js/post.js 2018-05-08 23:44:57 UTC (rev 43184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1269,34 +1269,3 @@
</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"> } )( jQuery, new wp.utils.WordCounter() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-( function( $ ) {
- // Privacy policy postbox, copy button.
- $( document ).on( 'click', function( event ) {
- var $target = $( event.target );
- var node, range;
-
- if ( $target.is( 'button.privacy-text-copy' ) ) {
- node = $target.parent().parent().find( 'div.policy-text' )[0];
-
- if ( node ) {
- try {
- window.getSelection().removeAllRanges();
- range = document.createRange();
- range.selectNodeContents( node );
- window.getSelection().addRange( range );
-
- document.execCommand( 'copy' );
- window.getSelection().removeAllRanges();
- } catch ( er ) {}
- }
- } else if ( $target.is( 'button.policy-text-more' ) ) {
- $target.parents( '.privacy-text-section' ).removeClass( 'folded' )
- .find( '.policy-text' ).attr( 'aria-expanded', 'true' );
- } else if ( $target.is( 'button.policy-text-less' ) ) {
- $target.parents( '.privacy-text-section' ).addClass( 'folded' )
- .find( '.policy-text' ).attr( 'aria-expanded', 'false' );
- }
- });
-
-} )( jQuery );
</del></span></pre></div>
<a id="trunksrcwpadminjsxfnjs"></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/js/xfn.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/xfn.js 2018-05-08 23:28:47 UTC (rev 43183)
+++ trunk/src/wp-admin/js/xfn.js 2018-05-08 23:44:57 UTC (rev 43184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,3 +221,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_next_erasure( 1, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+( function( $ ) {
+ // Privacy policy page, copy button.
+ $( document ).on( 'click', function( event ) {
+ var $target = $( event.target );
+ var $parent, $container, range;
+
+ if ( $target.is( 'button.privacy-text-copy' ) ) {
+ $parent = $target.parent().parent();
+ $container = $parent.find( 'div.wp-suggested-text' );
+
+ if ( ! $container.length ) {
+ $container = $parent.find( 'div.policy-text' );
+ }
+
+ if ( $container.length ) {
+ try {
+ window.getSelection().removeAllRanges();
+ range = document.createRange();
+ $container.addClass( 'hide-privacy-policy-tutorial' );
+
+ range.selectNodeContents( $container[0] );
+ window.getSelection().addRange( range );
+ document.execCommand( 'copy' );
+
+ $container.removeClass( 'hide-privacy-policy-tutorial' );
+ window.getSelection().removeAllRanges();
+ } catch ( er ) {}
+ }
+ }
+ });
+
+} )( jQuery );
</ins></span></pre></div>
<a id="trunksrcwpadminprivacyphp"></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/privacy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/privacy.php 2018-05-08 23:28:47 UTC (rev 43183)
+++ trunk/src/wp-admin/privacy.php 2018-05-08 23:44:57 UTC (rev 43184)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,8 +13,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to manage privacy on this site.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
+ require_once( ABSPATH . 'wp-admin/includes/misc.php' );
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // "Borrow" xfn.js for now so we don't have to create new files.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// wp_enqueue_script( 'xfn' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+wp_enqueue_script( 'xfn' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $action = isset( $_POST['action'] ) ? $_POST['action'] : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,9 +40,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'updated'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'create-privacy-page' === $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! class_exists( 'WP_Privacy_Policy_Content' ) ) {
- require_once( ABSPATH . 'wp-admin/includes/misc.php' );
- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $privacy_policy_page_content = WP_Privacy_Policy_Content::get_default_content();
</span><span class="cx" style="display: block; padding: 0 10px"> $privacy_policy_page_id = wp_insert_post(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,6 +116,20 @@
</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"> <div class="wrap">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+if ( isset( $_GET['wp-suggested-policy-content'] ) ) {
+
+ ?>
+ <h1><?php _e( 'Privacy Policy Guide' ); ?></h1>
+ <div class="wp-suggested-policy-content">
+ <?php WP_Privacy_Policy_Content::privacy_policy_guide(); ?>
+ </div>
+ <?php
+
+} else {
+
+?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'Privacy Settings' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Privacy Policy page' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,5 +220,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} // End if/else isset( $_GET['wp-suggested-policy-content'] ).
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-footer.php' );
</span></span></pre>
</div>
</div>
</body>
</html>