Changeset 13326

Timestamp:

09/19/2022 11:05:29 PM (3 years ago)

Author:

imath

Message:

Improve the way we check the group context of logging activities

[13308] introduced a PHP warning due to a misuse of the
groups_get_current_group() function (my bad!). When no group is
displayed this function returns false, so checking if it's a
BP_Groups_Group object having an id property is wrong.

Fixes #8604

File:

• trunk/src/bp-activity/bp-activity-template.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-template.php

@@ -1569 +1569 @@
             }
 
-            if ( 'created_group' === $activity_type || 'joined_group' === $activity_type ) {
+            if ( bp_is_active( 'groups' ) && ( 'created_group' === $activity_type || 'joined_group' === $activity_type ) ) {
                 $group         = bp_get_group( $activity->item_id );
                 $current_group = groups_get_current_group();
 
                 // Do not use generated-content activities when displaying a group activity stream.
-                if ( (int) $group->id === (int) $current_group->id ) {
+                if ( isset( $current_group->id ) && (int) $group->id === (int) $current_group->id ) {
                     return false;
                 }