Ticket #7870: 7870.02.patch

src/bp-groups/actions/create.php

@@ -182 +182 @@
                         setcookie( 'bp_completed_create_steps', false, time() - 3600, COOKIEPATH, COOKIE_DOMAIN, is_ssl() );
 
                         // Once we completed all steps, record the group creation in the activity stream.
-                        groups_record_activity( array(
-                                'type' => 'created_group',
-                                'item_id' => $bp->groups->new_group_id
-                        ) );
+                        if ( bp_is_active( 'activity' ) ) {
+                                groups_record_activity( array(
+                                        'type' => 'created_group',
+                                        'item_id' => $bp->groups->new_group_id
+                                ) );
+                        }
 
                         /**
                          * Fires after the group has been successfully created.

src/bp-groups/bp-groups-functions.php

@@ -585 +585 @@
                 $group = $bp->groups->current_group;
 
         // Record this in activity streams.
-        groups_record_activity( array(
-                'type'    => 'joined_group',
-                'item_id' => $group_id,
-                'user_id' => $user_id,
-        ) );
+        if ( bp_is_active( 'activity' ) ) {
+                groups_record_activity( array(
+                        'type'    => 'joined_group',
+                        'item_id' => $group_id,
+                        'user_id' => $user_id,
+                ) );
+        }
 
         /**
          * Fires after a user joins a group.

src/bp-groups/screens/user/invites.php

@@ -28 +28 @@
 
                         bp_core_add_message( sprintf( __( 'Group invite accepted. Visit %s.', 'buddypress' ), bp_get_group_link( $group ) ) );
 
-                        groups_record_activity( array(
-                                'type'    => 'joined_group',
-                                'item_id' => $group->id
-                        ) );
+                        if ( bp_is_active( 'activity' ) ) {
+                                groups_record_activity( array(
+                                        'type'    => 'joined_group',
+                                        'item_id' => $group->id
+                                ) );
+                        }
                 }
 
                 if ( isset( $_GET['redirect_to'] ) ) {

src/bp-templates/bp-nouveau/includes/groups/ajax.php

@@ -107 +107 @@
                                 );
 
                         } else {
-                                groups_record_activity(
-                                        array(
-                                                'type'    => 'joined_group',
-                                                'item_id' => $group->id,
-                                        )
-                                );
+                                if ( bp_is_active( 'activity' ) ) {
+                                        groups_record_activity(
+                                                array(
+                                                        'type'    => 'joined_group',
+                                                        'item_id' => $group->id,
+                                                )
+                                        );
+                                }
 
                                 // User is now a member of the group
                                 $group->is_member = '1';