Changeset 13156 for trunk/src/bp-groups/classes/class-bp-groups-component.php

Timestamp:

11/25/2021 12:30:33 AM (3 years ago)

Author:

dcavins

Message:

Declare invitations as feature of groups component.

Centralize the logic which determines whether
group invitations are active by declaring
invitations as a feature of the groups
component. This also makes it easy for
developers to filter that value using the
bp_is_groups_invitations_active filter hook.

Props imath.

Fixes #8550.

File:

• trunk/src/bp-groups/classes/class-bp-groups-component.php (modified) (7 diffs)

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

@@ -111 +111 @@
      */
     public function __construct() {
+        $features = array();
+        if ( bp_is_active( 'friends' ) ) {
+            $features[] = 'invitations';
+        }
+
         parent::start(
             'groups',
@@ -117 +122 @@
             array(
                 'adminbar_myaccount_order' => 70,
-                'search_query_arg' => 'groups_search',
+                'search_query_arg'         => 'groups_search',
+                'features'                 => $features,
             )
         );
@@ -393 +399 @@
         }
 
-        // If friends component is active, add invitations.
-        if ( bp_is_active( 'friends' ) ) {
+        // If invitations are enabled, add invitations.
+        if ( bp_is_active( 'groups', 'invitations' ) ) {
             $this->group_creation_steps['group-invites'] = array(
                 'name'     => _x( 'Invites',  'Group screen nav', 'buddypress' ),
@@ -608 +614 @@
             );
 
-            // Add the Group Invites nav item.
-            $sub_nav[] = array(
-                'name'            => __( 'Invitations', 'buddypress' ),
-                'slug'            => 'invites',
-                'parent_url'      => $groups_link,
-                'parent_slug'     => $slug,
-                'screen_function' => 'groups_screen_group_invites',
-                'user_has_access' => $access,
-                'position'        => 30
-            );
+            if ( bp_is_active( 'groups', 'invitations' ) ) {
+                // Add the Group Invites nav item.
+                $sub_nav[] = array(
+                    'name'            => __( 'Invitations', 'buddypress' ),
+                    'slug'            => 'invites',
+                    'parent_url'      => $groups_link,
+                    'parent_slug'     => $slug,
+                    'screen_function' => 'groups_screen_group_invites',
+                    'user_has_access' => $access,
+                    'position'        => 30
+                );
+            }
 
             parent::setup_nav( $main_nav, $sub_nav );
@@ -706 +714 @@
             }
 
-            if ( bp_is_active( 'friends' ) && bp_groups_user_can_send_invites() ) {
+            if ( bp_is_active( 'groups', 'invitations' ) ) {
                 $sub_nav[] = array(
                     'name'            => _x( 'Send Invites', 'My Group screen nav', 'buddypress' ),
@@ -834 +842 @@
             $groups_link = trailingslashit( bp_loggedin_user_domain() . bp_get_groups_slug() );
 
-            // Pending group invites.
-            $count   = groups_get_invite_count_for_user();
             $title   = _x( 'Groups', 'My Account Groups', 'buddypress' );
             $pending = _x( 'No Pending Invites', 'My Account Groups sub nav', 'buddypress' );
 
-            if ( $count ) {
-                $title = sprintf(
-                    /* translators: %s: Group invitation count for the current user */
-                    _x( 'Groups %s', 'My Account Groups nav', 'buddypress' ),
-                    '<span class="count">' . bp_core_number_format( $count ) . '</span>'
-                );
-
-                $pending = sprintf(
-                    /* translators: %s: Group invitation count for the current user */
-                    _x( 'Pending Invites %s', 'My Account Groups sub nav', 'buddypress' ),
-                    '<span class="count">' . bp_core_number_format( $count ) . '</span>'
-                );
+            if ( bp_is_active( 'groups', 'invitations' ) ) {
+                // Pending group invites.
+                $count   = groups_get_invite_count_for_user();
+                if ( $count ) {
+                    $title = sprintf(
+                        /* translators: %s: Group invitation count for the current user */
+                        _x( 'Groups %s', 'My Account Groups nav', 'buddypress' ),
+                        '<span class="count">' . bp_core_number_format( $count ) . '</span>'
+                    );
+
+                    $pending = sprintf(
+                        /* translators: %s: Group invitation count for the current user */
+                        _x( 'Pending Invites %s', 'My Account Groups sub nav', 'buddypress' ),
+                        '<span class="count">' . bp_core_number_format( $count ) . '</span>'
+                    );
+                }
             }
 
@@ -871 +881 @@
 
             // Invitations.
-            $wp_admin_nav[] = array(
-                'parent'   => 'my-account-' . $this->id,
-                'id'       => 'my-account-' . $this->id . '-invites',
-                'title'    => $pending,
-                'href'     => trailingslashit( $groups_link . 'invites' ),
-                'position' => 30
-            );
+            if ( bp_is_active( 'groups', 'invitations' ) ) {
+                $wp_admin_nav[] = array(
+                    'parent'   => 'my-account-' . $this->id,
+                    'id'       => 'my-account-' . $this->id . '-invites',
+                    'title'    => $pending,
+                    'href'     => trailingslashit( $groups_link . 'invites' ),
+                    'position' => 30
+                );
+            }
 
             // Create a Group.