<!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>[BuddyPress][12416] trunk/src: BP Settings: Introduce a new BP friendly name key into data exporters</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://buddypress.trac.wordpress.org/changeset/12416">12416</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12416","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-07-25 13:54:40 +0000 (Thu, 25 Jul 2019)</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'>BP Settings: Introduce a new BP friendly name key into data exporters
The name of this key is {{{exporter_bp_friendly_name}}}. It is added to BP & WP exporter arrays to adapt the existing {{{exporter_friendly_name}}} for a non Administrator role context. If this new key is provided it will be used to output the friendly name of the exported items, otherwise it will use the existing {{{exporter_friendly_name}}} key.
For example, into the items list of the {{{site.url/username/settings/data}}} page of the logged in user, "WordPress Comments" will be replaced by "Comments" and so on for every built-in WordPress and BuddyPress items.
Props sbrajesh, r-a-y, boonebgorges
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8013">#8013</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityfiltersphp">trunk/src/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunksrcbpfriendsbpfriendsfiltersphp">trunk/src/bp-friends/bp-friends-filters.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsfiltersphp">trunk/src/bp-groups/bp-groups-filters.php</a></li>
<li><a href="#trunksrcbpmessagesbpmessagesfiltersphp">trunk/src/bp-messages/bp-messages-filters.php</a></li>
<li><a href="#trunksrcbpnotificationsbpnotificationsfiltersphp">trunk/src/bp-notifications/bp-notifications-filters.php</a></li>
<li><a href="#trunksrcbpsettingsbpsettingsfiltersphp">trunk/src/bp-settings/bp-settings-filters.php</a></li>
<li><a href="#trunksrcbpsettingsbpsettingsfunctionsphp">trunk/src/bp-settings/bp-settings-functions.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofilefiltersphp">trunk/src/bp-xprofile/bp-xprofile-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-activity/bp-activity-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-activity/bp-activity-filters.php 2019-07-25 12:35:00 UTC (rev 12415)
+++ trunk/src/bp-activity/bp-activity-filters.php 2019-07-25 13:54:40 UTC (rev 12416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,6 +818,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Registers Activity personal data exporter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 adds an `exporter_bp_friendly_name` param to exporters.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $exporters An array of personal data exporters.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array An array of personal data exporters.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -824,8 +825,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_activity_register_personal_data_exporter( $exporters ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $exporters['buddypress-activity'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exporter_friendly_name' => __( 'BuddyPress Activity Data', 'buddypress' ),
- 'callback' => 'bp_activity_personal_data_exporter',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exporter_friendly_name' => __( 'BuddyPress Activity Data', 'buddypress' ),
+ 'callback' => 'bp_activity_personal_data_exporter',
+ 'exporter_bp_friendly_name' => _x( 'Activity Data', 'BuddyPress Activity data exporter friendly name', 'buddypress' ),
</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"> return $exporters;
</span></span></pre></div>
<a id="trunksrcbpfriendsbpfriendsfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-friends/bp-friends-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-friends/bp-friends-filters.php 2019-07-25 12:35:00 UTC (rev 12415)
+++ trunk/src/bp-friends/bp-friends-filters.php 2019-07-25 13:54:40 UTC (rev 12416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Registers Friends personal data exporter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 adds an `exporter_bp_friendly_name` param to exporters.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $exporters An array of personal data exporters.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array An array of personal data exporters.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,18 +59,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_friends_register_personal_data_exporters( $exporters ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $exporters['buddypress-friends'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exporter_friendly_name' => __( 'BuddyPress Friends', 'buddypress' ),
- 'callback' => 'bp_friends_personal_data_exporter',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exporter_friendly_name' => __( 'BuddyPress Friends', 'buddypress' ),
+ 'callback' => 'bp_friends_personal_data_exporter',
+ 'exporter_bp_friendly_name' => _x( 'Friends', 'BuddyPress Friends data exporter friendly name', 'buddypress' ),
</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"> $exporters['buddypress-friends-pending-sent-requests'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exporter_friendly_name' => __( 'BuddyPress Friend Requests (Sent)', 'buddypress' ),
- 'callback' => 'bp_friends_pending_sent_requests_personal_data_exporter',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exporter_friendly_name' => __( 'BuddyPress Friend Requests (Sent)', 'buddypress' ),
+ 'callback' => 'bp_friends_pending_sent_requests_personal_data_exporter',
+ 'exporter_bp_friendly_name' => _x( 'Friend Requests (Sent)', 'BuddyPress Friend Requests data exporter friendly name', 'buddypress' ),
</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"> $exporters['buddypress-friends-pending-received-requests'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exporter_friendly_name' => __( 'BuddyPress Friend Requests (Received)', 'buddypress' ),
- 'callback' => 'bp_friends_pending_received_requests_personal_data_exporter',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exporter_friendly_name' => __( 'BuddyPress Friend Requests (Received)', 'buddypress' ),
+ 'callback' => 'bp_friends_pending_received_requests_personal_data_exporter',
+ 'exporter_bp_friendly_name' => _x( 'Friend Requests (Received)', 'BuddyPress Friend Requests data exporter friendly name', 'buddypress' ),
</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"> return $exporters;
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-filters.php 2019-07-25 12:35:00 UTC (rev 12415)
+++ trunk/src/bp-groups/bp-groups-filters.php 2019-07-25 13:54:40 UTC (rev 12416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,6 +370,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Registers Groups personal data exporters.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 adds an `exporter_bp_friendly_name` param to exporters.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $exporters An array of personal data exporters.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array An array of personal data exporters.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,23 +377,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_groups_register_personal_data_exporters( $exporters ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $exporters['buddypress-groups-memberships'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exporter_friendly_name' => __( 'BuddyPress Group Memberships', 'buddypress' ),
- 'callback' => 'bp_groups_memberships_personal_data_exporter',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exporter_friendly_name' => __( 'BuddyPress Group Memberships', 'buddypress' ),
+ 'callback' => 'bp_groups_memberships_personal_data_exporter',
+ 'exporter_bp_friendly_name' => _x( 'Group Memberships', 'BuddyPress Group Memberships data exporter friendly name', 'buddypress' ),
</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"> $exporters['buddypress-groups-pending-requests'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exporter_friendly_name' => __( 'BuddyPress Pending Group Membership Requests', 'buddypress' ),
- 'callback' => 'bp_groups_pending_requests_personal_data_exporter',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exporter_friendly_name' => __( 'BuddyPress Pending Group Membership Requests', 'buddypress' ),
+ 'callback' => 'bp_groups_pending_requests_personal_data_exporter',
+ 'exporter_bp_friendly_name' => _x( 'Pending Group Membership Requests', 'BuddyPress Pending Group Membership Requests data exporter friendly name', 'buddypress' ),
</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"> $exporters['buddypress-groups-pending-received-invitations'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exporter_friendly_name' => __( 'BuddyPress Pending Group Invitations (Received)', 'buddypress' ),
- 'callback' => 'bp_groups_pending_received_invitations_personal_data_exporter',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exporter_friendly_name' => __( 'BuddyPress Pending Group Invitations (Received)', 'buddypress' ),
+ 'callback' => 'bp_groups_pending_received_invitations_personal_data_exporter',
+ 'exporter_bp_friendly_name' => _x( 'Pending Group Invitations (Received)', 'BuddyPress Pending Group Invitations data exporter friendly name', 'buddypress' ),
</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"> $exporters['buddypress-groups-pending-sent-invitations'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exporter_friendly_name' => __( 'BuddyPress Pending Group Invitations (Sent)', 'buddypress' ),
- 'callback' => 'bp_groups_pending_sent_invitations_personal_data_exporter',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exporter_friendly_name' => __( 'BuddyPress Pending Group Invitations (Sent)', 'buddypress' ),
+ 'callback' => 'bp_groups_pending_sent_invitations_personal_data_exporter',
+ 'exporter_bp_friendly_name' => _x( 'Pending Group Invitations (Sent)', 'BuddyPress Pending Group Invitations data exporter friendly name', 'buddypress' ),
</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"> return $exporters;
</span></span></pre></div>
<a id="trunksrcbpmessagesbpmessagesfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/bp-messages-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/bp-messages-filters.php 2019-07-25 12:35:00 UTC (rev 12415)
+++ trunk/src/bp-messages/bp-messages-filters.php 2019-07-25 13:54:40 UTC (rev 12416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,6 +134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Register Messages personal data exporter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 adds an `exporter_bp_friendly_name` param to exporters.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $exporters An array of personal data exporters.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array An array of personal data exporters.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,8 +141,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_messages_register_personal_data_exporter( $exporters ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $exporters['buddypress-messages'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exporter_friendly_name' => __( 'BuddyPress Messages', 'buddypress' ),
- 'callback' => 'bp_messages_personal_data_exporter',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exporter_friendly_name' => __( 'BuddyPress Messages', 'buddypress' ),
+ 'callback' => 'bp_messages_personal_data_exporter',
+ 'exporter_bp_friendly_name' => _x( 'Private Messages', 'BuddyPress Messages data exporter friendly name', 'buddypress' ),
</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"> return $exporters;
</span></span></pre></div>
<a id="trunksrcbpnotificationsbpnotificationsfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-notifications/bp-notifications-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-notifications/bp-notifications-filters.php 2019-07-25 12:35:00 UTC (rev 12415)
+++ trunk/src/bp-notifications/bp-notifications-filters.php 2019-07-25 13:54:40 UTC (rev 12416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,6 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Register Notifications personal data exporter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 adds an `exporter_bp_friendly_name` param to exporters.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $exporters An array of personal data exporters.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array An array of personal data exporters.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,8 +21,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_register_notifications_personal_data_exporter( $exporters ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $exporters['buddypress-notifications'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exporter_friendly_name' => __( 'BuddyPress Notifications Data', 'buddypress' ),
- 'callback' => 'bp_notifications_personal_data_exporter',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exporter_friendly_name' => __( 'BuddyPress Notifications Data', 'buddypress' ),
+ 'callback' => 'bp_notifications_personal_data_exporter',
+ 'exporter_bp_friendly_name' => _x( 'Notifications Data', 'BuddyPress Notifications data exporter friendly name', 'buddypress' ),
</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"> return $exporters;
</span></span></pre></div>
<a id="trunksrcbpsettingsbpsettingsfiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-settings/bp-settings-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-settings/bp-settings-filters.php 2019-07-25 12:35:00 UTC (rev 12415)
+++ trunk/src/bp-settings/bp-settings-filters.php 2019-07-25 13:54:40 UTC (rev 12416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,6 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Registers Settings personal data exporter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 adds an `exporter_bp_friendly_name` param to exporters.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $exporters An array of personal data exporters.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array An array of personal data exporters.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,8 +20,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_settings_register_personal_data_exporter( $exporters ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $exporters['buddypress-settings'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exporter_friendly_name' => __( 'BuddyPress Settings Data', 'buddypress' ),
- 'callback' => 'bp_settings_personal_data_exporter',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exporter_friendly_name' => __( 'BuddyPress Settings Data', 'buddypress' ),
+ 'callback' => 'bp_settings_personal_data_exporter',
+ 'exporter_bp_friendly_name' => _x( 'Personal settings', 'BuddyPress Settings Data data exporter friendly name', 'buddypress' ),
</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"> return $exporters;
</span></span></pre></div>
<a id="trunksrcbpsettingsbpsettingsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-settings/bp-settings-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-settings/bp-settings-functions.php 2019-07-25 12:35:00 UTC (rev 12415)
+++ trunk/src/bp-settings/bp-settings-functions.php 2019-07-25 13:54:40 UTC (rev 12416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,26 +316,46 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Piggybacks off of the 'wp_privacy_personal_data_exporters' filter and the
</span><span class="cx" style="display: block; padding: 0 10px"> * 'exporter_friendly_name' key, which is meant for the admin area.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @todo We should look for a custom key like 'exporter_frontend_name' if available.
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 Looks for a potential exporter's BP/custom friendly name.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_settings_data_exporter_items() {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in /wp-admin/includes/ajax-actions.php */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exporters = apply_filters( 'wp_privacy_personal_data_exporters', array() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exporters = apply_filters( 'wp_privacy_personal_data_exporters', array() );
+ $custom_friendly_names = apply_filters( 'bp_settings_data_custom_friendly_names', array(
+ 'wordpress-comments' => _x( 'Comments', 'WP Comments data exporter friendly name', 'buddypress' ),
+ 'wordpress-media' => _x( 'Media', 'WP Media data exporter friendly name', 'buddypress' ),
+ 'wordpress-user' => _x( 'Personal information', 'WP Media data exporter friendly name', 'buddypress' ),
+ ) );
</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"> <ul>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $exporters as $exporter => $data ) :
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Use the exporter friendly name by default.
+ $friendly_name = $data['exporter_friendly_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">- * Filters the data exporter name for display on the "Settings > Data" page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Use the exporter friendly name if directly available
+ * into the exporters array.
+ */
+ if ( isset( $data['exporter_bp_friendly_name'] ) ) {
+ $friendly_name = $data['exporter_bp_friendly_name'];
+
+ // Look for a potential match into the custom friendly names.
+ } elseif ( isset( $custom_friendly_names[ $exporter ] ) ) {
+ $friendly_name = $custom_friendly_names[ $exporter ];
+ }
+
+ /**
+ * Filters the data exporter friendly name for display on the "Settings > Data" page.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 replaces the `$name` parameter with the `$friendly_name` one.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $name Data exporter friendly name.
- * @param string $exporter Internal exporter name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $friendly_name Data exporter friendly name.
+ * @param string $exporter Internal exporter 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">- $item = apply_filters( 'bp_settings_data_exporter_name', esc_html( $data['exporter_friendly_name'] ), $exporter );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item = apply_filters( 'bp_settings_data_exporter_name', esc_html( $friendly_name ), $exporter );
</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"> <li><?php echo $item; ?></li>
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofilefiltersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-filters.php 2019-07-25 12:35:00 UTC (rev 12415)
+++ trunk/src/bp-xprofile/bp-xprofile-filters.php 2019-07-25 13:54:40 UTC (rev 12416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -666,6 +666,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Register XProfile personal data exporter.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 adds an `exporter_bp_friendly_name` param to exporters.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $exporters An array of personal data exporters.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array An array of personal data exporters.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -672,8 +673,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_xprofile_register_personal_data_exporter( $exporters ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $exporters['buddypress-xprofile'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exporter_friendly_name' => __( 'BuddyPress Extended Profile Data', 'buddypress' ),
- 'callback' => 'bp_xprofile_personal_data_exporter',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exporter_friendly_name' => __( 'BuddyPress Extended Profile Data', 'buddypress' ),
+ 'callback' => 'bp_xprofile_personal_data_exporter',
+ 'exporter_bp_friendly_name' => _x( 'Extended Profile information', 'BuddyPress Extended Profile data exporter friendly name', 'buddypress' ),
</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"> return $exporters;
</span></span></pre>
</div>
</div>
</body>
</html>