<!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>[7249] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php: Privacy: clarify language on erasure request page, and prep for trial.</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="http://meta.trac.wordpress.org/changeset/7249">7249</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/7249","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>tellyworth</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-05-30 06:33:44 +0000 (Wed, 30 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: clarify language on erasure request page, and prep for trial.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacydataerasurerequestphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgmainpageaboutprivacydataerasurerequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php        2018-05-30 06:02:00 UTC (rev 7248)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-main/page-about-privacy-data-erasure-request.php  2018-05-30 06:33:44 UTC (rev 7249)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,6 +57,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        border-left: 4px solid green;
</span><span class="cx" style="display: block; padding: 0 10px">                        padding: 6px;
</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.alert {
+                       border: 1px solid red;
+                       border-left: 4px solid red;
+                       padding: 6px;
+                       margin-bottom: 2rem;
+               }       
</ins><span class="cx" style="display: block; padding: 0 10px">                 form.request-form label {
</span><span class="cx" style="display: block; padding: 0 10px">                        display: block;
</span><span class="cx" style="display: block; padding: 0 10px">                        color: #555;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,6 +71,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                form.request-form input[type="email"] {
</span><span class="cx" style="display: block; padding: 0 10px">                        width: 100%;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                form.request-form input:invalid {
+                       border: 1px solid red;
+               }
+               h5 {
+                       margin-top: 1rem;
+               }
</ins><span class="cx" style="display: block; padding: 0 10px">         </style>';
</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">@@ -80,24 +92,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="entry-content row">
</span><span class="cx" style="display: block; padding: 0 10px">                                <section class="col-8">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><em>This page is under active development and is not currently enabled. All text is not final and will change.</em></p>
-
</del><span class="cx" style="display: block; padding: 0 10px">                                         <p><?php esc_html_e( 'WordPress.org respects your privacy and intends to remain transparent about any personal data we store about individuals. Under the General Data Protection Regulation (GDPR), EU citizens and residents may request deletion of personal data stored on our servers.', 'wporg' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        <p><?php esc_html_e( 'The following form will allow you to request deletion of your account and relevant personal and private data. You will be required to authenticate ownership of that address, and may be asked to provide additional identification or information necessary to verify the request.', 'wporg' ); ?></p>
</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><?php esc_html_e( 'This will request permanent deletion of your WordPress.org account, and relevant personal or private data stored on WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org, and other related domains and sites.', 'wporg'); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <div class="alert">
+                                               <h5><?php esc_html_e( 'Important!', 'wporg' ); ?></h5>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <p><?php
-                                               printf(
-                                                       /* translators: link to privacy policy. */
-                                                       esc_html__( 'Not all data can be erased, please review the %s for details.', 'wporg' ),
-                                                       '<a href="/about/privacy/">' . esc_html_x( 'Privacy Policy', 'Page title', 'wporg' ) . '</a>'
-                                               );
-                                       ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         <p><?php printf( wp_kses_post( __( 'This will request permanent deletion of your <strong>WordPress.org</strong> account, and relevant personal or private data stored on <strong>%s</strong>, and other related domains and sites.', 'wporg') ), 'WordPress.org, WordPress.net, WordCamp.org, BuddyPress.org, bbPress.org' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                <p><?php esc_html_e( 'Please note that we cannot remove or provide access to data stored on WordPress sites hosted or administered by third parties.', 'wporg' ); ?></p>
+
+                                               <p><?php
+                                                       printf(
+                                                               /* translators: link to privacy policy. */
+                                                               wp_kses_post( __('Not all data can be erased, please review the <a href="%s">Privacy Policy</a> for details.', 'wporg' ) ),
+                                                               'https://wordpress.org/about/privacy/'
+                                                       );
+                                               ?></p>
+                                       </div>
+
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <?php if ( $error_message ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                                                 <p class="error">
</span><span class="cx" style="display: block; padding: 0 10px">                                                        <strong><?php esc_html_e( 'An error occured with your request:', 'wporg' ); ?></strong><br>
</span><span class="cx" style="display: block; padding: 0 10px">                                                        <?php echo $error_message; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,16 +121,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                <p class="success"><strong><?php esc_html_e( 'Please check your email for a confirmation link, and follow the instructions to authenticate your request.', 'wporg' ); ?></strong></p>
</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php endif; ?>
</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 class="error">
-                                               <strong>This is currently disabled unless you have a 'special' WordPress.org account.</strong>
-                                               <br>
-                                               <span style="color: red">DO NOT REQUEST ERASURE UNLESS YOU WANT YOUR ACCOUNT DELETED.</span>
-                                               </strong>
-                                       </p>
-                                       <?php if ( is_user_logged_in() && wporg_user_has_restricted_password() ) : ?>
-                                               <p class="success">PS: You have a special account.</p>
-                                       <?php endif; ?>
-
</del><span class="cx" style="display: block; padding: 0 10px">                                         <form id="erase-request-form" class="request-form" method="POST" action="#">
</span><span class="cx" style="display: block; padding: 0 10px">                                                <label for="email">
</span><span class="cx" style="display: block; padding: 0 10px">                                                        <?php esc_html_e( 'Email Address', 'wporg' ); ?>
</span></span></pre>
</div>
</div>

</body>
</html>