Ticket #4991: 4999.01.patch

bp-xprofile/bp-xprofile-screens.php

@@ -37 +37 @@
  */
 function xprofile_screen_edit_profile() {
 
-        if ( !bp_is_my_profile() && !bp_current_user_can( 'bp_moderate' ) )
+        // Bail if not the correct screen or if the current user cannot edit this
+        // user's settings
+        if ( ! bp_is_my_profile() && ! bp_core_can_edit_settings() ) {
                 return false;
+        }
 
         $bp = buddypress();
 
@@ -149 +152 @@
  */
 function xprofile_screen_change_avatar() {
 
-        // Bail if not the correct screen
-        if ( !bp_is_my_profile() && !bp_current_user_can( 'bp_moderate' ) )
+        // Bail if not the correct screen or if the current user cannot edit this
+        // user's settings
+        if ( ! bp_is_my_profile() && ! bp_core_can_edit_settings() ) {
                 return false;
+        }
 
         // Bail if there are action variables
         if ( bp_action_variables() ) {