Changeset 7077

Timestamp:

05/15/2013 06:26:48 PM (11 years ago)

Author:

r-a-y

Message:

Only register legacy forum activity actions if the legacy forums are active.

Fixes #4979. Props imath.

File:

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

trunk/bp-groups/bp-groups-activity.php

@@ -17 +17 @@
     global $bp;
 
-    if ( !bp_is_active( 'activity' ) )
+    if ( ! bp_is_active( 'activity' ) ) {
         return false;
+    }
 
     bp_activity_set_action( $bp->groups->id, 'created_group',   __( 'Created a group',       'buddypress' ) );
     bp_activity_set_action( $bp->groups->id, 'joined_group',    __( 'Joined a group',        'buddypress' ) );
-    bp_activity_set_action( $bp->groups->id, 'new_forum_topic', __( 'New group forum topic', 'buddypress' ) );
-    bp_activity_set_action( $bp->groups->id, 'new_forum_post',  __( 'New group forum post',  'buddypress' ) );
+
+    // These actions are for the legacy forums
+    // Since the bbPress plugin also shares the same 'forums' identifier, we also
+    // check for the legacy forums loader class to be extra cautious
+    if ( bp_is_active( 'forums' ) && class_exists( 'BP_Forums_Component' ) ) {
+        bp_activity_set_action( $bp->groups->id, 'new_forum_topic', __( 'New group forum topic', 'buddypress' ) );
+        bp_activity_set_action( $bp->groups->id, 'new_forum_post',  __( 'New group forum post',  'buddypress' ) );
+    }
 
     do_action( 'groups_register_activity_actions' );