Ticket #8151: 8151.patch

src/bp-groups/classes/class-bp-groups-component.php

@@ -932 +932 @@
          *                           description.
          */
         public function rest_api_init( $controllers = array() ) {
-                parent::rest_api_init( array(
+                $controllers = array(
                         'BP_REST_Groups_Endpoint',
                         'BP_REST_Group_Membership_Endpoint',
                         'BP_REST_Group_Invites_Endpoint',
                         'BP_REST_Group_Membership_Request_Endpoint',
-                        'BP_REST_Attachments_Group_Avatar_Endpoint',
-                ) );
+                );
+
+                // Only Load the Group's Avatar controller if Group Avatar uploads are allowed.
+                if ( ! bp_disable_group_avatar_uploads() ) {
+                        $controllers[] = 'BP_REST_Attachments_Group_Avatar_Endpoint';
+                }
+
+                parent::rest_api_init( $controllers );
         }
 }

src/bp-members/classes/class-bp-members-component.php

@@ -473 +473 @@
                          */
                         'BP_REST_Components_Endpoint',
                         'BP_REST_Members_Endpoint',
-                        'BP_REST_Attachments_Member_Avatar_Endpoint',
                 ) );
         }
 }

src/bp-xprofile/classes/class-bp-xprofile-component.php

@@ -499 +499 @@
          *                           description.
          */
         public function rest_api_init( $controllers = array() ) {
-                parent::rest_api_init( array(
+                $controllers = array(
                         'BP_REST_XProfile_Fields_Endpoint',
                         'BP_REST_XProfile_Field_Groups_Endpoint',
                         'BP_REST_XProfile_Data_Endpoint',
-                ) );
+                );
+
+                // Only Load the Member's Avatar controller if Avatar uploads are allowed.
+                if ( ! bp_disable_avatar_uploads() ) {
+                        $controllers[] = 'BP_REST_Attachments_Member_Avatar_Endpoint';
+                }
+
+                parent::rest_api_init( $controllers );
         }
 }