Ticket #2176: 2176.01.patch

includes/extend/buddypress/activity.php

@@ -235 +235 @@
          * @uses bp_activity_set_action()
          */
         public function register_activity_actions() {
+                // Sitewide activity stream items
                 bp_activity_set_action( $this->component, $this->topic_create, __( 'New topic created', 'bbpress' ) );
                 bp_activity_set_action( $this->component, $this->reply_create, __( 'New reply created', 'bbpress' ) );
+
+                // Group forum activity stream items
+                if ( bp_is_active( 'groups' ) ) {
+                        bp_activity_set_action(
+                                buddypress()->groups->id,
+                                $this->topic_create,
+                                __( 'New topic created', 'bbpress' )
+                        );
+
+                        bp_activity_set_action(
+                                buddypress()->groups->id,
+                                $this->reply_create,
+                                __( 'New reply created', 'bbpress' )
+                        );
+                }
         }
 
         /**
@@ -500 +516 @@
                 if ( $activity_id = $this->get_activity_id( $topic_id ) )
                         return bp_activity_delete( array( 'id' => $activity_id ) );
 
-                return false;           
+                return false;
         }
 
         /**
@@ -651 +667 @@
                 if ( $activity_id = $this->get_activity_id( $reply_id ) )
                         return bp_activity_delete( array( 'id' => $activity_id ) );
 
-                return false;           
+                return false;
         }
 
         /**

includes/extend/buddypress/loader.php

@@ -134 +134 @@
         public function setup_actions() {
 
                 // Setup the components
-                add_action( 'bp_init', array( $this, 'setup_components' ) );
+                add_action( 'bp_init', array( $this, 'setup_components' ), 7 );
 
                 parent::setup_actions();
         }