<!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>[43061] trunk: Privacy: improve `wp_privacy_erase_personal_data()`, return boolean values.</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/43061">43061</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/43061","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-01 19:26:53 +0000 (Tue, 01 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: improve `wp_privacy_erase_personal_data()`, return boolean values.
Props ericdaams.
See <a href="https://core.trac.wordpress.org/ticket/43602">#43602</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminjsxfnjs">trunk/src/wp-admin/js/xfn.js</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunktestsphpunittestscommentphp">trunk/tests/phpunit/tests/comment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></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/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2018-05-01 18:59:48 UTC (rev 43060)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2018-05-01 19:26:53 UTC (rev 43061)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4564,8 +4564,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Array of personal data exporters.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $callback Callable eraser that accepts an email address and
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * a page and returns an array with the number of items
- * removed, the number of items retained and any messages
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * a page and returns an array with boolean values for
+ * whether items were removed or retained and any messages
</ins><span class="cx" style="display: block; padding: 0 10px"> * from the eraser, as well as if additional pages are
</span><span class="cx" style="display: block; padding: 0 10px"> * available.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $exporter_friendly_name Translated user facing friendly name for the eraser.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4632,11 +4632,11 @@
</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">- if ( ! array_key_exists( 'num_items_removed', $response ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! array_key_exists( 'items_removed', $response ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %1$s: eraser friendly name, %2$d: array index */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Expected num_items_removed key in response array from %1$s eraser (index %2$d).' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Expected items_removed key in response array from %1$s eraser (index %2$d).' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_html( $eraser_friendly_name ),
</span><span class="cx" style="display: block; padding: 0 10px"> $eraser_index
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4643,11 +4643,11 @@
</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">- if ( ! array_key_exists( 'num_items_retained', $response ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! array_key_exists( 'items_retained', $response ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %1$s: eraser friendly name, %2$d: array index */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Expected num_items_retained key in response array from %1$s eraser (index %2$d).' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'Expected items_retained key in response array from %1$s eraser (index %2$d).' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_html( $eraser_friendly_name ),
</span><span class="cx" style="display: block; padding: 0 10px"> $eraser_index
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4689,10 +4689,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // No erasers, so we're done.
</span><span class="cx" style="display: block; padding: 0 10px"> $response = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'num_items_removed' => 0,
- 'num_items_retained' => 0,
- 'messages' => array(),
- 'done' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'items_removed' => false,
+ 'items_retained' => false,
+ 'messages' => array(),
+ 'done' => true,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<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-01 18:59:48 UTC (rev 43060)
+++ trunk/src/wp-admin/js/xfn.js 2018-05-01 19:26:53 UTC (rev 43061)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,8 +141,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var nonce = $action.data( 'nonce' );
</span><span class="cx" style="display: block; padding: 0 10px"> var erasersCount = $action.data( 'erasers-count' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var removedCount = 0;
- var retainedCount = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var hasRemoved = false;
+ var hasRetained = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> var messages = [];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $action.blur();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,8 +152,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> set_action_state( $action, 'remove_personal_data_idle' );
</span><span class="cx" style="display: block; padding: 0 10px"> var summaryMessage = strings.noDataFound;
</span><span class="cx" style="display: block; padding: 0 10px"> var classes = 'notice-success';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 === removedCount ) {
- if ( 0 === retainedCount ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === hasRemoved ) {
+ if ( false === hasRetained ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> summaryMessage = strings.noDataFound;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> summaryMessage = strings.noneRemoved;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> classes = 'notice-warning';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 === retainedCount ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === hasRetained ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> summaryMessage = strings.foundAndRemoved;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> summaryMessage = strings.someNotRemoved;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,11 +192,11 @@
</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"> var responseData = response.data;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( responseData.num_items_removed ) {
- removedCount += responseData.num_items_removed;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( responseData.items_removed ) {
+ hasRemoved = hasRemoved || responseData.items_removed;
</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 ( responseData.num_items_retained ) {
- retainedCount += responseData.num_items_removed;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( responseData.items_retained ) {
+ hasRetained = hasRetained || responseData.items_retained;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( responseData.messages ) {
</span><span class="cx" style="display: block; padding: 0 10px"> messages = messages.concat( responseData.messages );
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2018-05-01 18:59:48 UTC (rev 43060)
+++ trunk/src/wp-includes/comment.php 2018-05-01 19:26:53 UTC (rev 43061)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3412,17 +3412,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $email_address ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'num_items_removed' => 0,
- 'num_items_retained' => 0,
- 'messages' => array(),
- 'done' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'items_removed' => false,
+ 'items_retained' => false,
+ 'messages' => array(),
+ 'done' => true,
</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="cx" style="display: block; padding: 0 10px"> // Limit us to 500 comments at a time to avoid timing out.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $number = 500;
- $page = (int) $page;
- $num_items_removed = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $number = 500;
+ $page = (int) $page;
+ $items_removed = false;
+ $items_retained = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = get_comments(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3469,6 +3470,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[] = sprintf( __( 'Comment %d contains personal data but could not be anonymized.' ), $comment_id );
</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">+ $items_retained = true;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">@@ -3479,8 +3482,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updated = $wpdb->update( $wpdb->comments, $anonymized_comment, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $updated ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $num_items_removed++;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $items_removed = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> clean_comment_cache( $comment_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $items_retained = true;
</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">@@ -3487,9 +3492,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $done = count( $comments ) < $number;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'num_items_removed' => $num_items_removed,
- 'num_items_retained' => count( $comments ) - $num_items_removed,
- 'messages' => $messages,
- 'done' => $done,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'items_removed' => $items_removed,
+ 'items_retained' => $items_retained,
+ 'messages' => $messages,
+ 'done' => $done,
</ins><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">+
</ins></span></pre></div>
<a id="trunktestsphpunittestscommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment.php 2018-05-01 18:59:48 UTC (rev 43060)
+++ trunk/tests/phpunit/tests/comment.php 2018-05-01 19:26:53 UTC (rev 43061)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -877,10 +877,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_comments_personal_data_eraser( 'nocommentsfound@local.host' );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'num_items_removed' => 0,
- 'num_items_retained' => 0,
- 'messages' => array(),
- 'done' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'items_removed' => false,
+ 'items_retained' => false,
+ 'messages' => array(),
+ 'done' => true,
</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"> $this->assertSame( $expected, $actual );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -908,10 +908,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_comments_personal_data_eraser( $args['comment_author_email'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'num_items_removed' => 1,
- 'num_items_retained' => 0,
- 'messages' => array(),
- 'done' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'items_removed' => true,
+ 'items_retained' => false,
+ 'messages' => array(),
+ 'done' => true,
</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"> $this->assertSame( $expected, $actual );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -939,10 +939,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_comments_personal_data_eraser( $args['comment_author_email'], 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'num_items_removed' => 0,
- 'num_items_retained' => 0,
- 'messages' => array(),
- 'done' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'items_removed' => false,
+ 'items_retained' => false,
+ 'messages' => array(),
+ 'done' => true,
</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"> $this->assertSame( $expected, $actual );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -975,10 +975,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( 'Comment %d contains personal data but could not be anonymized.', $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'num_items_removed' => 0,
- 'num_items_retained' => 1,
- 'messages' => array( $message ),
- 'done' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'items_removed' => false,
+ 'items_retained' => true,
+ 'messages' => array( $message ),
+ 'done' => true,
</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"> $this->assertSame( $expected, $actual );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1011,10 +1011,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( 'Some custom message for comment %d.', $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'num_items_removed' => 0,
- 'num_items_retained' => 1,
- 'messages' => array( $message ),
- 'done' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'items_removed' => false,
+ 'items_retained' => true,
+ 'messages' => array( $message ),
+ 'done' => true,
</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"> $this->assertSame( $expected, $actual );
</span></span></pre>
</div>
</div>
</body>
</html>