Ticket #6520: 6520.diff

src/bp-members/bp-members-screens.php

@@ -144 +144 @@
                                         }
 
                                         // Create errors for required fields without values
-                                        if ( xprofile_check_is_required_field( $field_id ) && empty( $_POST['field_' . $field_id] ) )
+                                        if ( xprofile_check_is_required_field( $field_id ) && empty( $_POST[ 'field_' . $field_id ] ) && ! bp_current_user_can( 'bp_moderate' ) )
                                                 $bp->signup->errors['field_' . $field_id] = __( 'This is a required field', 'buddypress' );
                                 }
 

src/bp-xprofile/bp-xprofile-admin.php

@@ -852 +852 @@
                                         }
                                 }
 
-                                $is_required[ $field_id ] = xprofile_check_is_required_field( $field_id );
+                                $is_required[ $field_id ] = xprofile_check_is_required_field( $field_id ) && ! bp_current_user_can( 'bp_moderate' );
                                 if ( $is_required[ $field_id ] && empty( $_POST['field_' . $field_id ] ) ) {
                                         $redirect_to = add_query_arg( 'error', '2', $redirect_to );
                                         bp_core_redirect( $redirect_to );

src/bp-xprofile/bp-xprofile-functions.php

@@ -515 +515 @@
         // Define locale variable(s)
         $retval = false;
 
-        // Super admins can skip required check
-        if ( bp_current_user_can( 'bp_moderate' ) && ! is_admin() ) {
-                $retval = false;
-
-        // All other users will use the field's setting
-        } elseif ( isset( $field->is_required ) ) {
+        if ( isset( $field->is_required ) ) {
                 $retval = $field->is_required;
         }
 

src/bp-xprofile/bp-xprofile-screens.php

@@ -101 +101 @@
 
                         }
 
-                        $is_required[$field_id] = xprofile_check_is_required_field( $field_id );
+                        $is_required[ $field_id ] = xprofile_check_is_required_field( $field_id ) && ! bp_current_user_can( 'bp_moderate' );
                         if ( $is_required[$field_id] && empty( $_POST['field_' . $field_id] ) ) {
                                 $errors = true;
                         }

src/bp-xprofile/bp-xprofile-template.php

@@ -821 +821 @@
                 // Define locale variable(s)
                 $retval = false;
 
-                // Super admins can skip required check
-                if ( bp_current_user_can( 'bp_moderate' ) && !is_admin() ) {
-                        $retval = false;
-
-                // All other users will use the field's setting
-                } elseif ( isset( $field->is_required ) ) {
+                if ( isset( $field->is_required ) ) {
                         $retval = $field->is_required;
                 }