Changeset 3232 for trunk/bp-groups.php

Timestamp:

09/06/2010 04:24:57 PM (14 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk

File:

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

trunk/bp-groups.php

@@ -492 +492 @@
 
     if ( $bp->is_single_item ) {
-        /* Refresh the group member count meta */
-        groups_update_groupmeta( $bp->groups->current_group->id, 'total_member_count', groups_get_total_member_count( $bp->groups->current_group->id ) );
-
         do_action( 'groups_screen_group_members', $bp->groups->current_group->id );
         bp_core_load_template( apply_filters( 'groups_template_group_members', 'groups/single/home' ) );
@@ -798 +795 @@
 
     if ( $bp->current_component == $bp->groups->slug && 'membership-requests' == $bp->action_variables[0] ) {
-
-        /* Ask for a login if the user is coming here via an email notification */
-        if ( !is_user_logged_in() )
-            bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . $bp->root_domain . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/membership-requests/' ) );
 
         if ( !$bp->is_item_admin || 'public' == $bp->groups->current_group->status )
@@ -1653 +1646 @@
 }
 
-function groups_get_total_member_count( $group_id ) {
-    return BP_Groups_Group::get_total_member_count( $group_id );
-}
-
 /*** Group Fetching, Filtering & Searching  *************************************/
 
@@ -1814 +1803 @@
     groups_update_groupmeta( $group_id, 'forum_id', $forum_id );
 
-    do_action( 'groups_new_group_forum', $forum_id, $group_id );
+    do_action( 'groups_new_group_forum', $forum, $group_id );
 }
 
@@ -2417 +2406 @@
     do_action( 'groups_remove_data_for_user', $user_id );
 }
-add_action( 'wpmu_delete_user', 'groups_remove_data_for_user' );
-add_action( 'delete_user', 'groups_remove_data_for_user' );
-add_action( 'make_spam_user', 'groups_remove_data_for_user' );
+add_action( 'wpmu_delete_user', 'groups_remove_data_for_user', 1 );
+add_action( 'delete_user', 'groups_remove_data_for_user', 1 );
+add_action( 'make_spam_user', 'groups_remove_data_for_user', 1 );