Changeset 12125

Timestamp:

05/25/2018 11:11:48 PM (8 years ago)

Author:

r-a-y

Message:

Groups: Wrap groups_record_activity() calls with bp_is_active( 'activity' )

In r11924, the bp-groups-activity.php file is loaded only if the Activity
component is enabled.

However, the groups_record_activity() function is located in this file.
Because this function now relies on the Activity component, if the Activity
component is disabled, a fatal error can occur during certain group
actions. This commit addresses the problem by checking for the Activity
component before calling on the function.

Anti-props r-a-y.

See #7870 (3.x branch).

Location:

branches/3.0/src

Files:

• bp-groups/actions/create.php (modified) (1 diff)
• bp-groups/bp-groups-functions.php (modified) (1 diff)
• bp-groups/screens/user/invites.php (modified) (1 diff)
• bp-templates/bp-nouveau/includes/groups/ajax.php (modified) (1 diff)

branches/3.0/src/bp-groups/actions/create.php

@@ -183 +183 @@
 
                         // 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
+                                ) );
+                        }
 
                         /**

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

@@ -586 +586 @@
 
         // 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,
+                ) );
+        }
 
         /**

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

@@ -29 +29 @@
                         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
+                                ) );
+                        }
                 }
 

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

@@ -108 +108 @@
 
                         } 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