Changeset 2822 for trunk/bp-groups.php

Timestamp:

03/08/2010 04:20:25 PM (16 years ago)

Author:

apeatling

Message:

Merge 1.2 branch with trunk

File:

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

trunk/bp-groups.php

@@ -269 +269 @@
         if ( isset($_GET['n']) ) {
                 // Delete group request notifications for the user
-                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'membership_request_accepted' );
-                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'membership_request_rejected' );
-                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_mod' );
-                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_admin' );
+                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'membership_request_accepted' );
+                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'membership_request_rejected' );
+                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_mod' );
+                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_admin' );
         }
 
@@ -322 +322 @@
 
         // Remove notifications
-        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'group_invite' );
+        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'group_invite' );
 
         do_action( 'groups_screen_group_invites', $group_id );
@@ -335 +335 @@
                 if ( isset($_GET['n']) ) {
                         // Delete group request notifications for the user
-                        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'membership_request_accepted' );
-                        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'membership_request_rejected' );
-                        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_mod' );
-                        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'member_promoted_to_admin' );
+                        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'membership_request_accepted' );
+                        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'membership_request_rejected' );
+                        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_mod' );
+                        bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'member_promoted_to_admin' );
                 }
 
@@ -873 +873 @@
 
                 // Remove any screen notifications
-                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->slug, 'new_membership_request' );
+                bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->groups->id, 'new_membership_request' );
 
                 $request_action = $bp->action_variables[1];
@@ -1545 +1545 @@
         }
 
+        groups_update_groupmeta( $group->id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
         do_action( 'groups_settings_updated', $group->id );
 
@@ -1842 +1843 @@
                 'content' => false,
                 'user_id' => $bp->loggedin_user->id,
-                'group_id' => false
+                'group_id' => $bp->groups->current_group->id
         );
 
@@ -1866 +1867 @@
                 'content' => apply_filters( 'groups_activity_new_update_content', $activity_content ),
                 'type' => 'activity_update',
-                'item_id' => $bp->groups->current_group->id
+                'item_id' => $group_id
         ) );
 
@@ -2159 +2160 @@
         groups_update_groupmeta( $group_id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
 
-        bp_core_delete_notifications_for_user_by_item_id( $user_id, $group_id, $bp->groups->slug, 'group_invite' );
+        bp_core_delete_notifications_for_user_by_item_id( $user_id, $group_id, $bp->groups->id, 'group_invite' );
 
         do_action( 'groups_accept_invite', $user_id, $group_id );
@@ -2180 +2181 @@
 
         if ( $delete )
-                bp_core_delete_notifications_for_user_by_item_id( $user_id, $group_id, $bp->groups->slug, 'group_invite' );
+                bp_core_delete_notifications_for_user_by_item_id( $user_id, $group_id, $bp->groups->id, 'group_invite' );
 
         return $delete;