Changeset 1750 for trunk/bp-groups.php

Timestamp:

09/01/2009 02:12:35 AM (17 years ago)

Author:

apeatling

Message:

Further activity action revisions.

File:

• trunk/bp-groups.php (modified) (7 diffs)

trunk/bp-groups.php

@@ -148 +148 @@
         
         $bp->groups->valid_status = apply_filters( 'groups_valid_status', array( 'public', 'private', 'hidden' ) );
-
-        /* Register the activity stream actions for this component */
-        groups_register_activity_action( 'created_group', __( 'Created a group', 'buddypress' ) );
-        groups_register_activity_action( 'joined_group', __( 'Joined a group', 'buddypress' ) );
-        groups_register_activity_action( 'new_wire_post', __( 'New group wire post', 'buddypress' ) );
-        groups_register_activity_action( 'new_forum_topic', __( 'New group forum topic', 'buddypress' ) );
-        groups_register_activity_action( 'new_forum_post', __( 'New group forum post', 'buddypress' ) );
 }
 add_action( 'plugins_loaded', 'groups_setup_globals', 5 );      
@@ -1374 +1367 @@
  */
 
+function groups_register_activity_actions() {
+        global $bp;
+        
+        if ( !function_exists( 'bp_activity_set_action' ) )
+                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_wire_post', __( 'New group wire post', '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' ) );
+
+        do_action( 'groups_register_activity_actions' );
+}
+add_action( 'plugins_loaded', 'groups_register_activity_actions' );
+
 function groups_record_activity( $args = '' ) {
         global $bp;
@@ -1400 +1409 @@
         
         return bp_activity_add( array( 'user_id' => $user_id, 'content' => $content, 'primary_link' => $primary_link, 'component_name' => $component_name, 'component_action' => $component_action, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
-}
-
-function groups_register_activity_action( $key, $value ) {
-        global $bp;
-        
-        if ( !function_exists( 'bp_activity_set_action' ) )
-                return false;
-        
-        return apply_filters( 'groups_register_activity_action', bp_activity_set_action( $bp->groups->id, $key, $value ), $key, $value );
 }
 
@@ -1677 +1677 @@
         /* Delete the activity stream item */
         if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
-                bp_activity_delete_by_item_id( array( 'item_id' => $group_id, 'component_name' => 'groups', 'component_action' => $bp->activity->actions->groups['created_group'] ) );
+                bp_activity_delete_by_item_id( array( 'item_id' => $group_id, 'component_name' => 'groups', 'component_action' => 'created_group' ) );
         }       
  
@@ -1992 +1992 @@
                 /* Delete the activity stream item */
                 if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
-                        bp_activity_delete_by_item_id( array( 'item_id' => $wire_post_id, 'component_name' => 'groups', 'component_action' => $bp->activity->actions->groups['new_wire_post'] ) );
+                        bp_activity_delete_by_item_id( array( 'item_id' => $wire_post_id, 'component_name' => 'groups', 'component_action' => 'new_wire_post' ) );
                 }
                         
@@ -2080 +2080 @@
         if ( $topic = bp_forums_update_topic( array( 'topic_title' => $topic_title, 'topic_text' => $topic_text, 'topic_id' => $topic_id ) ) ) {
                 /* Update the activity stream item */
-                bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => 'groups', 'component_action' => $bp->activity->actions->groups['new_forum_topic'] ) );
+                bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => 'groups', 'component_action' => 'new_forum_topic' ) );
                 
                 $activity_content = sprintf( __( '%s started the forum topic %s in the group %s:', 'buddypress'), bp_core_get_userlink( $topic->topic_poster ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug .'">' . attribute_escape( $topic->topic_title ) . '</a>', '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
@@ -2110 +2110 @@
                 /* Delete the activity stream item */
                 if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
-                        bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => 'groups', 'component_action' => $bp->activity->actions->groups['new_forum_topic'] ) );
+                        bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => 'groups', 'component_action' => 'new_forum_topic' ) );
                         bp_activity_delete_by_item_id( array( 'item_id' => $topic_id, 'component_name' => 'groups', 'component_action' => 'new_forum_post' ) );
                 }