Ticket #8529: 8529.patch

src/bp-core/classes/class-bp-admin.php

@@ -761 +761 @@
                                                 <?php
                                                 printf(
                                                         /* translators: 1: heart dashicons. 2: BP Credits screen url. 3: number of BuddyPress contributors to this version. */
-                                                        _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' ),
+                                                        _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' ),
                                                         '<span class="dashicons dashicons-heart"></span>',
                                                         esc_url( bp_get_admin_url( 'admin.php?page=bp-credits' ) ),
-                                                        number_format_i18n( 18 )
+                                                        number_format_i18n( 19 )
                                                 );
                                                 ?>
                                         </p>
@@ -948 +948 @@
                                 <a href="https://profiles.wordpress.org/sbrajesh/">Brajesh Singh (sbrajesh)</a>,
                                 <a href="https://profiles.wordpress.org/dcavins/">David Cavins (dcavins)</a>,
                                 <a href="https://profiles.wordpress.org/johnjamesjacoby/">John James Jacoby (johnjamesjacoby)</a>,
+                                <a href="https://profiles.wordpress.org/leahkoerper/">leahkoerper</a>,
                                 <a href="https://profiles.wordpress.org/imath/">Mathieu Viet (imath)</a>,
                                 <a href="https://profiles.wordpress.org/modemlooper/">modemlooper</a>,
                                 <a href="https://profiles.wordpress.org/niftythree/">Nifty (niftythree)</a>,

src/bp-members/admin/js/admin.js

@@ -2 +2 @@
 
 ( function( $ ) {
         // Profile Visibility Settings
-
         $( '.visibility-toggle-link' ).on( 'click', function( event ) {
                 event.preventDefault();
 
                 $( this ).attr( 'aria-expanded', 'true' ).parent().hide()
-                        .siblings( '.field-visibility-settings' ).show();
+                             .siblings( '.field-visibility-settings' ).show();
         } );
 
         $( '.field-visibility-settings-close' ).on( 'click', function( event ) {
                 event.preventDefault();
 
-                 $( '.visibility-toggle-link' ).attr( 'aria-expanded', 'false' );
+                $( '.visibility-toggle-link' ).attr( 'aria-expanded', 'false' );
 
-                var settings_div = $(this).parent(),
-                vis_setting_text = settings_div.find( 'input:checked' ).parent().text();
+                var settings_div = $( this ).parent(),
+                    vis_setting_text = settings_div.find( 'input:checked' ).parent().text();
 
                 settings_div.hide()
-                        .siblings( '.field-visibility-settings-toggle' )
-                                .children( '.current-visibility-level' ).text( vis_setting_text ).end()
-                        .show();
+                                .siblings( '.field-visibility-settings-toggle' )
+                                .find( '.current-visibility-level' ).text( vis_setting_text ).end()
+                                .show();
         } );
 
 } )( jQuery );

src/bp-xprofile/classes/class-bp-xprofile-user-admin.php

@@ -271 +271 @@
                 }
 
                 $r = bp_parse_args( $args['args'], array(
-                        'profile_group_id' => 0,
-                        'user_id'          => $user->ID,
-                        'hide_field_types' => array( 'wp-textbox', 'wp-biography' ),
+                        '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(),
                 ), 'bp_xprofile_user_admin_profile_loop_args' );
 
                 // We really need these args.