<!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][13017] trunk/src: Make sure regular users can edit field visibility in wp-admin/extended</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/13017">13017</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/13017","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>2021-07-15 19:08:36 +0000 (Thu, 15 Jul 2021)</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'>Make sure regular users can edit field visibility in wp-admin/extended

As we're very close to 9.0.0-RC1, we're also updating credits to include leahkoerper to the list.

Props leahkoerper

Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8529">#8529</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcoreclassesclassbpadminphp">trunk/src/bp-core/classes/class-bp-admin.php</a></li>
<li><a href="#trunksrcbpmembersadminjsadminjs">trunk/src/bp-members/admin/js/admin.js</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofileuseradminphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-user-admin.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcoreclassesclassbpadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/classes/class-bp-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/classes/class-bp-admin.php      2021-07-15 15:34:22 UTC (rev 13016)
+++ trunk/src/bp-core/classes/class-bp-admin.php        2021-07-15 19:08:36 UTC (rev 13017)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -761,10 +761,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                <?php
</span><span class="cx" style="display: block; padding: 0 10px">                                                printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: 1: heart dashicons. 2: BP Credits screen url. 3: number of BuddyPress contributors to this version. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        _n( 'Built with %1$s by <a href="%2$s">%3$d volunteer</a>.', 'Built with %1$s by <a href="%2$s">%3$d volunteers</a>.', 18, 'buddypress' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 _n( 'Built with %1$s by <a href="%2$s">%3$d volunteer</a>.', 'Built with %1$s by <a href="%2$s">%3$d volunteers</a>.', 19, 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                                         '<span class="dashicons dashicons-heart"></span>',
</span><span class="cx" style="display: block; padding: 0 10px">                                                        esc_url( bp_get_admin_url( 'admin.php?page=bp-credits' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                        number_format_i18n( 18 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                 number_format_i18n( 19 )
</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">                                        </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -948,6 +948,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                <a href="https://profiles.wordpress.org/sbrajesh/">Brajesh Singh (sbrajesh)</a>,
</span><span class="cx" style="display: block; padding: 0 10px">                                <a href="https://profiles.wordpress.org/dcavins/">David Cavins (dcavins)</a>,
</span><span class="cx" style="display: block; padding: 0 10px">                                <a href="https://profiles.wordpress.org/johnjamesjacoby/">John James Jacoby (johnjamesjacoby)</a>,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                <a href="https://profiles.wordpress.org/leahkoerper/">leahkoerper</a>,
</ins><span class="cx" style="display: block; padding: 0 10px">                                 <a href="https://profiles.wordpress.org/imath/">Mathieu Viet (imath)</a>,
</span><span class="cx" style="display: block; padding: 0 10px">                                <a href="https://profiles.wordpress.org/modemlooper/">modemlooper</a>,
</span><span class="cx" style="display: block; padding: 0 10px">                                <a href="https://profiles.wordpress.org/niftythree/">Nifty (niftythree)</a>,
</span></span></pre></div>
<a id="trunksrcbpmembersadminjsadminjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-members/admin/js/admin.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-members/admin/js/admin.js    2021-07-15 15:34:22 UTC (rev 13016)
+++ trunk/src/bp-members/admin/js/admin.js      2021-07-15 19:08:36 UTC (rev 13017)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,26 +2,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> ( function( $ ) {
</span><span class="cx" style="display: block; padding: 0 10px">        // Profile Visibility Settings
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">         $( '.visibility-toggle-link' ).on( 'click', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px">                event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $( this ).attr( 'aria-expanded', 'true' ).parent().hide()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        .siblings( '.field-visibility-settings' ).show();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                      .siblings( '.field-visibility-settings' ).show();
</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">        $( '.field-visibility-settings-close' ).on( 'click', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px">                event.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 $( '.visibility-toggle-link' ).attr( 'aria-expanded', 'false' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $( '.visibility-toggle-link' ).attr( 'aria-expanded', 'false' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                var settings_div = $(this).parent(),
-               vis_setting_text = settings_div.find( 'input:checked' ).parent().text();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         var settings_div = $( this ).parent(),
+                   vis_setting_text = settings_div.find( 'input:checked' ).parent().text();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                settings_div.hide()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        .siblings( '.field-visibility-settings-toggle' )
-                               .children( '.current-visibility-level' ).text( vis_setting_text ).end()
-                       .show();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         .siblings( '.field-visibility-settings-toggle' )
+                               .find( '.current-visibility-level' ).text( vis_setting_text ).end()
+                               .show();
</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"> } )( jQuery );
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofileuseradminphp"></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/classes/class-bp-xprofile-user-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-user-admin.php    2021-07-15 15:34:22 UTC (rev 13016)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-user-admin.php      2021-07-15 19:08:36 UTC (rev 13017)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,9 +271,10 @@
</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">                $r = bp_parse_args( $args['args'], array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'profile_group_id' => 0,
-                       'user_id'          => $user->ID,
-                       'hide_field_types' => array( 'wp-textbox', 'wp-biography' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'profile_group_id'       => 0,
+                       'user_id'                => $user->ID,
+                       'hide_field_types'       => array( 'wp-textbox', 'wp-biography' ),
+                       'fetch_visibility_level' => bp_current_user_can( 'bp_moderate' ) || (int) $user->ID === (int) get_current_user_id(),
</ins><span class="cx" style="display: block; padding: 0 10px">                 ), 'bp_xprofile_user_admin_profile_loop_args' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // We really need these args.
</span></span></pre>
</div>
</div>

</body>
</html>