Ticket #7156: 7156.5.patch

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

@@ -352 +352 @@
 
                 parent::setup_cache_groups();
         }
+
+        /**
+         * Init the BP REST API.
+         *
+         * @since 6.0.0
+         *
+         * @param array $controllers Optional. See BP_Component::rest_api_init() for
+         *                           description.
+         */
+        public function rest_api_init( $controllers = array() ) {
+                if ( is_multisite() ) {
+                        $controllers = array(
+                                'BP_REST_Blogs_Endpoint',
+                        );
+
+                        // Support to Blog Avatar.
+                        if ( bp_is_active( 'blogs', 'site-icon' ) ) {
+                                $controllers[] = 'BP_REST_Attachments_Blog_Avatar_Endpoint';
+                        }
+                }
+
+                parent::rest_api_init( $controllers );
+        }
 }

new file src/bp-core/classes/class-bp-rest-attachments-group-avatar-endpoint.php

@@ +1 @@
+<?php
+/**
+ * BP REST: BP_REST_Attachments_Group_Avatar_Endpoint class
+ *
+ * @package BuddyPress
+ * @deprecated 6.0.0
+ */
+
+defined( 'ABSPATH' ) || exit;
+
+_deprecated_file( basename( __FILE__ ), '6.0.0', 'bp-groups/classes/class-bp-rest-attachments-group-avatar-endpoint.php' );
+
+/** BP_REST_Attachments_Group_Avatar_Endpoint class */
+require_once trailingslashit( constant( 'BP_PLUGIN_DIR' ) . constant( 'BP_SOURCE_SUBDIRECTORY' ) ) . 'bp-groups/classes/class-bp-rest-attachments-group-avatar-endpoint.php';

new file src/bp-core/classes/class-bp-rest-attachments-member-avatar-endpoint.php

@@ +1 @@
+<?php
+/**
+ * BP REST: BP_REST_Attachments_Member_Avatar_Endpoint class
+ *
+ * @package BuddyPress
+ * @deprecated 6.0.0
+ */
+
+defined( 'ABSPATH' ) || exit;
+
+_deprecated_file( basename( __FILE__ ), '6.0.0', 'bp-members/classes/class-class-bp-rest-attachments-member-avatar-endpoint.php' );
+
+/** BP_REST_Attachments_Member_Avatar_Endpoint class */
+require_once trailingslashit( constant( 'BP_PLUGIN_DIR' ) . constant( 'BP_SOURCE_SUBDIRECTORY' ) ) . 'bp-members/classes/class-bp-rest-attachments-member-avatar-endpoint.php';

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

@@ -321 +321 @@
 
                 parent::setup_cache_groups();
         }
+
+        /**
+         * Init the BP REST API.
+         *
+         * @since 6.0.0
+         *
+         * @param array $controllers Optional. See BP_Component::rest_api_init() for
+         *                           description.
+         */
+        public function rest_api_init( $controllers = array() ) {
+                parent::rest_api_init( array( 'BP_REST_Friends_Endpoint' ) );
+        }
 }

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

@@ -928 +928 @@
          * Init the BP REST API.
          *
          * @since 5.0.0
+         * @since 6.0.0 Adds the Group Cover REST endpoint.
          *
          * @param array $controllers Optional. See BP_Component::rest_api_init() for
          *                           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',
-                ) );
+                );
+
+                // Support to Group Cover.
+                if ( bp_is_active( 'groups', 'cover_image' ) ) {
+                        $controllers[] = 'BP_REST_Attachments_Group_Cover_Endpoint';
+                }
+
+                parent::rest_api_init( $controllers );
         }
 
         /**

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

@@ -654 +654 @@
          * Init the BP REST API.
          *
          * @since 5.0.0
+         * @since 6.0.0 Adds the Member Cover and Signup REST endpoints.
          *
          * @param array $controllers Optional. See BP_Component::rest_api_init() for
          *                           description.
          */
         public function rest_api_init( $controllers = array() ) {
-                parent::rest_api_init( array(
+                $controllers = array(
                         /**
                          * As the Members component is always loaded,
                          * let's register the Components endpoint here.
@@ -667 +668 @@
                         'BP_REST_Components_Endpoint',
                         'BP_REST_Members_Endpoint',
                         'BP_REST_Attachments_Member_Avatar_Endpoint',
-                ) );
+                );
+
+                if ( bp_is_active( 'members', 'cover_image' ) ) {
+                        $controllers[] = 'BP_REST_Attachments_Member_Cover_Endpoint';
+                }
+
+                if ( bp_get_signup_allowed() ) {
+                        $controllers[] = 'BP_REST_Signup_Endpoint';
+                }
+
+                parent::rest_api_init( $controllers );
         }
 
         /**

src/class-buddypress.php

@@ -550 +550 @@
                         'BP_Akismet'                => 'activity',
                         'BP_REST_Activity_Endpoint' => 'activity',
 
-                        'BP_Admin'                                   => 'core',
-                        'BP_Attachment_Avatar'                       => 'core',
-                        'BP_Attachment_Cover_Image'                  => 'core',
-                        'BP_Attachment'                              => 'core',
-                        'BP_Button'                                  => 'core',
-                        'BP_Block'                                   => 'core',
-                        'BP_Component'                               => 'core',
-                        'BP_Customizer_Control_Range'                => 'core',
-                        'BP_Date_Query'                              => 'core',
-                        'BP_Email_Delivery'                          => 'core',
-                        'BP_Email_Address'                           => 'core',
-                        'BP_Email_Recipient'                         => 'core',
-                        'BP_Email_Sender'                            => 'core',
-                        'BP_Email_Participant'                       => 'core',
-                        'BP_Email'                                   => 'core',
-                        'BP_Embed'                                   => 'core',
-                        'BP_Media_Extractor'                         => 'core',
-                        'BP_Members_Suggestions'                     => 'core',
-                        'BP_PHPMailer'                               => 'core',
-                        'BP_Recursive_Query'                         => 'core',
-                        'BP_Suggestions'                             => 'core',
-                        'BP_Theme_Compat'                            => 'core',
-                        'BP_User_Query'                              => 'core',
-                        'BP_Walker_Category_Checklist'               => 'core',
-                        'BP_Walker_Nav_Menu_Checklist'               => 'core',
-                        'BP_Walker_Nav_Menu'                         => 'core',
-                        'BP_Invitation_Manager'                      => 'core',
-                        'BP_Invitation'                              => 'core',
-                        'BP_REST_Components_Endpoint'                => 'core',
-                        'BP_REST_Attachments'                        => 'core',
-                        'BP_REST_Attachments_Member_Avatar_Endpoint' => 'core',
-                        'BP_REST_Attachments_Group_Avatar_Endpoint'  => 'core',
-
-                        'BP_Core_Friends_Widget' => 'friends',
+                        'BP_REST_Blogs_Endpoint'                   => 'blogs',
+                        'BP_REST_Attachments_Blog_Avatar_Endpoint' => 'blogs',
+
+                        'BP_Admin'                     => 'core',
+                        'BP_Attachment_Avatar'         => 'core',
+                        'BP_Attachment_Cover_Image'    => 'core',
+                        'BP_Attachment'                => 'core',
+                        'BP_Button'                    => 'core',
+                        'BP_Block'                     => 'core',
+                        'BP_Component'                 => 'core',
+                        'BP_Customizer_Control_Range'  => 'core',
+                        'BP_Date_Query'                => 'core',
+                        'BP_Email_Delivery'            => 'core',
+                        'BP_Email_Address'             => 'core',
+                        'BP_Email_Recipient'           => 'core',
+                        'BP_Email_Sender'              => 'core',
+                        'BP_Email_Participant'         => 'core',
+                        'BP_Email'                     => 'core',
+                        'BP_Embed'                     => 'core',
+                        'BP_Media_Extractor'           => 'core',
+                        'BP_Members_Suggestions'       => 'core',
+                        'BP_PHPMailer'                 => 'core',
+                        'BP_Recursive_Query'           => 'core',
+                        'BP_Suggestions'               => 'core',
+                        'BP_Theme_Compat'              => 'core',
+                        'BP_User_Query'                => 'core',
+                        'BP_Walker_Category_Checklist' => 'core',
+                        'BP_Walker_Nav_Menu_Checklist' => 'core',
+                        'BP_Walker_Nav_Menu'           => 'core',
+                        'BP_Invitation_Manager'        => 'core',
+                        'BP_Invitation'                => 'core',
+                        'BP_REST_Components_Endpoint'  => 'core',
+                        'BP_REST_Attachments'          => 'core',
+
+                        'BP_Core_Friends_Widget'   => 'friends',
+                        'BP_REST_Friends_Endpoint' => 'friends',
 
                         'BP_Group_Extension'                        => 'groups',
                         'BP_Group_Member_Query'                     => 'groups',
@@ -591 +593 @@
                         'BP_REST_Group_Membership_Endpoint'         => 'groups',
                         'BP_REST_Group_Invites_Endpoint'            => 'groups',
                         'BP_REST_Group_Membership_Request_Endpoint' => 'groups',
-
-                        'BP_Core_Members_Template'       => 'members',
-                        'BP_Core_Members_Widget'         => 'members',
-                        'BP_Core_Recently_Active_Widget' => 'members',
-                        'BP_Core_Whos_Online_Widget'     => 'members',
-                        'BP_Registration_Theme_Compat'   => 'members',
-                        'BP_Signup'                      => 'members',
-                        'BP_REST_Members_Endpoint'       => 'members',
+                        'BP_REST_Attachments_Group_Avatar_Endpoint' => 'groups',
+                        'BP_REST_Attachments_Group_Cover_Endpoint'  => 'groups',
+
+                        'BP_Core_Members_Template'                   => 'members',
+                        'BP_Core_Members_Widget'                     => 'members',
+                        'BP_Core_Recently_Active_Widget'             => 'members',
+                        'BP_Core_Whos_Online_Widget'                 => 'members',
+                        'BP_Registration_Theme_Compat'               => 'members',
+                        'BP_Signup'                                  => 'members',
+                        'BP_REST_Members_Endpoint'                   => 'members',
+                        'BP_REST_Attachments_Member_Avatar_Endpoint' => 'members',
+                        'BP_REST_Attachments_Member_Cover_Endpoint'  => 'members',
+                        'BP_REST_Signup_Endpoint'                    => 'members',
 
                         'BP_REST_Messages_Endpoint' => 'messages',