<!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>[43157] branches/4.9/src: Privacy: Store plugin callbacks in associative array for flexibility.</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/43157">43157</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/43157","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-03 19:37:32 +0000 (Thu, 03 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: Store plugin callbacks in associative array for flexibility.
The personal data export and erasure tools allow plugins to register their own callbacks, in order to add additional data to the export and erasure processes. Previously, these were registered without specifying a constant identifier in the array of callbacks. Using mutable integers makes it difficult for plugins to modify the callbacks of other plugins, though.
Using associative array keys instead provides a covenient and reliable way to identify and interact with another plugin's callbacks.
Props desrosj, allendav, ocean90.
Merges <a href="https://core.trac.wordpress.org/changeset/43154">[43154]</a> to the 4.9 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/43931">#43931</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches49srcwpadminincludesadminfiltersphp">branches/4.9/src/wp-admin/includes/admin-filters.php</a></li>
<li><a href="#branches49srcwpadminincludesajaxactionsphp">branches/4.9/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#branches49srcwpadminincludesfilephp">branches/4.9/src/wp-admin/includes/file.php</a></li>
<li><a href="#branches49srcwpincludescommentphp">branches/4.9/src/wp-includes/comment.php</a></li>
<li><a href="#branches49srcwpincludesmediaphp">branches/4.9/src/wp-includes/media.php</a></li>
<li><a href="#branches49srcwpincludesuserphp">branches/4.9/src/wp-includes/user.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches49">branches/4.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.9
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.9 2018-05-03 19:34:21 UTC (rev 43156)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.9 2018-05-03 19:37:32 UTC (rev 43157)
</ins><a id="branches49"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.9</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42251,42256-42261,42350,42358,42362,42364-42368,42374,42388,42390,42401,42417,42421,42423-42425,42430,42433,42437,42441,42443,42446-42447,42449,42451,42453,42457,42459,42462,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606,42611-42613,42615,42617,42624-42625,42639,42648,42652-42653,42665,42687,42697,42711,42713,42719,42722,42739-42740,42744,42758,42772,42791-42792,42801,42814-42815,42817-42818,42823,42830,42837,42839,42841,42844,42851-42852,42860,42864,42881,42888-42889,42892-42894,42930,42964,42967,42971
-42972,42977-42978,42980,42985-42987,42989,42992,42994-42995,42998-42999,43001-43004,43007-43008,43011-43012,43014-43015,43025,43027,43030,43032,43034,43036,43039,43042,43044-43048,43052-43063,43065,43081,43085,43088-43089,43091,43104,43116,43118,43120-43121,43123,43125-43126,43131-43132,43135,43137,43139,43145-43148,43150,43155
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,42132,42134,42136,42138,42140,42144,42146,42148,42150,42152-42153,42155,42157,42159,42161,42163,42169,42171,42173,42175,42177,42181,42183,42185,42187,42189,42191,42193,42199,42203,42210,42214,42220,42222,42226,42242,42244,42247,42251,42256-42261,42350,42358,42362,42364-42368,42374,42388,42390,42401,42417,42421,42423-42425,42430,42433,42437,42441,42443,42446-42447,42449,42451,42453,42457,42459,42462,42491,42521,42529,42531,42533,42536,42538,42541,42543,42545,42549,42566,42568,42570,42572,42574,42576,42579,42581-42582,42584-42585,42587-42588,42590,42592,42594-42595,42598-42599,42602,42604,42606,42611-42613,42615,42617,42624-42625,42639,42648,42652-42653,42665,42687,42697,42711,42713,42719,42722,42739-42740,42744,42758,42772,42791-42792,42801,42814-42815,42817-42818,42823,42830,42837,42839,42841,42844,42851-42852,42860,42864,42881,42888-42889,42892-42894,42930,42964,42967,42971
-42972,42977-42978,42980,42985-42987,42989,42992,42994-42995,42998-42999,43001-43004,43007-43008,43011-43012,43014-43015,43025,43027,43030,43032,43034,43036,43039,43042,43044-43048,43052-43063,43065,43081,43085,43088-43089,43091,43104,43116,43118,43120-43121,43123,43125-43126,43131-43132,43135,43137,43139,43145-43148,43150,43154-43155
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches49srcwpadminincludesadminfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/includes/admin-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/includes/admin-filters.php 2018-05-03 19:34:21 UTC (rev 43156)
+++ branches/4.9/src/wp-admin/includes/admin-filters.php 2018-05-03 19:37:32 UTC (rev 43157)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Privacy hooks
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_filter( 'wp_privacy_personal_data_export_page', 'wp_privacy_process_personal_data_export_page', 10, 6 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_filter( 'wp_privacy_personal_data_export_page', 'wp_privacy_process_personal_data_export_page', 10, 7 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_privacy_personal_data_export_file', 'wp_privacy_generate_personal_data_export_file', 10 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Privacy policy text changes check.
</span></span></pre></div>
<a id="branches49srcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/includes/ajax-actions.php 2018-05-03 19:34:21 UTC (rev 43156)
+++ branches/4.9/src/wp-admin/includes/ajax-actions.php 2018-05-03 19:37:32 UTC (rev 43157)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4099,24 +4099,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( __( 'Exporter index out of range.' ) );
</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">- $index = $exporter_index - 1;
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $page < 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( __( 'Page index cannot be less than one.' ) );
</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">- $exporter = $exporters[ $index ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exporter_keys = array_keys( $exporters );
+ $exporter_key = $exporter_keys[ $exporter_index - 1 ];
+ $exporter = $exporters[ $exporter_key ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $exporter ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %d: array index */
- sprintf( __( 'Expected an array describing the exporter at index %d.' ), $exporter_index )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: array index */
+ sprintf( __( 'Expected an array describing the exporter at index %s.' ), $exporter_key )
</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"> if ( ! array_key_exists( 'exporter_friendly_name', $exporter ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %d: array index */
- sprintf( __( 'Exporter array at index %d does not include a friendly name.' ), $exporter_index )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: array index */
+ sprintf( __( 'Exporter array at index %s does not include a friendly name.' ), $exporter_key )
</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"> if ( ! array_key_exists( 'callback', $exporter ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4132,8 +4132,8 @@
</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">- $callback = $exporters[ $index ]['callback'];
- $exporter_friendly_name = $exporters[ $index ]['exporter_friendly_name'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $callback = $exporter['callback'];
+ $exporter_friendly_name = $exporter['exporter_friendly_name'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = call_user_func( $callback, $email_address, $page );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $response ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4185,8 +4185,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $page The page for this response.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $request_id The privacy request post ID associated with this request.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $send_as_email Whether the final results of the export should be emailed to the user.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $exporter_key The key (slug) of the exporter that provided this data.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response = apply_filters( 'wp_privacy_personal_data_export_page', $response, $exporter_index, $email_address, $page, $request_id, $send_as_email );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = apply_filters( 'wp_privacy_personal_data_export_page', $response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $response ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( $response );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4281,8 +4282,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( __( 'Page index cannot be less than one.' ) );
</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">- $index = $eraser_index - 1; // Convert to zero based for eraser index.
- $eraser = $erasers[ $index ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $eraser_keys = array_keys( $erasers );
+ $eraser_key = $eraser_keys[ $eraser_index - 1 ];
+ $eraser = $erasers[ $eraser_key ];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $eraser ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %d: array index */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4304,8 +4306,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( sprintf( __( 'Eraser array at index %d does not include a friendly name.' ), $eraser_index ) );
</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">- $callback = $erasers[ $index ]['callback'];
- $eraser_friendly_name = $erasers[ $index ]['eraser_friendly_name'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $callback = $eraser['callback'];
+ $eraser_friendly_name = $eraser['eraser_friendly_name'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = call_user_func( $callback, $email_address, $page );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4396,12 +4398,13 @@
</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 array $response The personal data for the given exporter and page.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $exporter_index The index of the exporter that provided this data.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $eraser_index The index of the eraser that provided this data.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $email_address The email address associated with this personal data.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $page The page for this response.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $request_id The privacy request post ID associated with this request.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $eraser_key The key (slug) of the eraser that provided this data.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response = apply_filters( 'wp_privacy_personal_data_erasure_page', $response, $eraser_index, $email_address, $page, $request_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = apply_filters( 'wp_privacy_personal_data_erasure_page', $response, $eraser_index, $email_address, $page, $request_id, $eraser_key );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $response ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error( $response );
</span></span></pre></div>
<a id="branches49srcwpadminincludesfilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-admin/includes/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-admin/includes/file.php 2018-05-03 19:34:21 UTC (rev 43156)
+++ branches/4.9/src/wp-admin/includes/file.php 2018-05-03 19:37:32 UTC (rev 43157)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2125,9 +2125,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $page The page of personal data for this exporter. Begins at 1.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $request_id The request ID for this personal data export.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $send_as_email Whether the final results of the export should be emailed to the user.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $exporter_key The slug (key) of the exporter.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array The filtered response.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_privacy_process_personal_data_export_page( $response, $exporter_index, $email_address, $page, $request_id, $send_as_email ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_privacy_process_personal_data_export_page( $response, $exporter_index, $email_address, $page, $request_id, $send_as_email, $exporter_key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Do some simple checks on the shape of the response from the exporter.
</span><span class="cx" style="display: block; padding: 0 10px"> * If the exporter response is malformed, don't attempt to consume it - let it
</span><span class="cx" style="display: block; padding: 0 10px"> * pass through to generate a warning to the user by default ajax processing.
</span></span></pre></div>
<a id="branches49srcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/comment.php 2018-05-03 19:34:21 UTC (rev 43156)
+++ branches/4.9/src/wp-includes/comment.php 2018-05-03 19:37:32 UTC (rev 43157)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3169,7 +3169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array $exporters An 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"> function wp_register_comment_personal_data_exporter( $exporters ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exporters[] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exporters['wordpress-comments'] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'exporter_friendly_name' => __( 'WordPress Comments' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => 'wp_comments_personal_data_exporter',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3274,7 +3274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array $erasers An array of personal data erasers.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_register_comment_personal_data_eraser( $erasers ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $erasers[] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $erasers['wordpress-comments'] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'eraser_friendly_name' => __( 'WordPress Comments' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => 'wp_comments_personal_data_eraser',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3382,4 +3382,3 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'done' => $done,
</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">-
</del></span></pre></div>
<a id="branches49srcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/media.php 2018-05-03 19:34:21 UTC (rev 43156)
+++ branches/4.9/src/wp-includes/media.php 2018-05-03 19:37:32 UTC (rev 43157)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3965,7 +3965,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array An 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"> function wp_register_media_personal_data_exporter( $exporters ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exporters[] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exporters['wordpress-media'] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'exporter_friendly_name' => __( 'WordPress Media' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => 'wp_media_personal_data_exporter',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="branches49srcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/user.php 2018-05-03 19:34:21 UTC (rev 43156)
+++ branches/4.9/src/wp-includes/user.php 2018-05-03 19:37:32 UTC (rev 43157)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2756,7 +2756,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array An 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"> function wp_register_user_personal_data_exporter( $exporters ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exporters[] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exporters['wordpress-user'] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'exporter_friendly_name' => __( 'WordPress User' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'callback' => 'wp_user_personal_data_exporter',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre>
</div>
</div>
</body>
</html>