Changeset 3541

Timestamp:

12/19/2010 12:29:04 PM (14 years ago)

Author:

djpaul

Message:

Always set is_member/is_banned in get_group_extras(), also updates bp_group_is_user_banned() for these changes. Fixes #2960

Location:

trunk/bp-groups

Files:

• bp-groups-classes.php (modified) (2 diffs)
• bp-groups-templatetags.php (modified) (3 diffs)

trunk/bp-groups/bp-groups-classes.php

@@ -527 +527 @@
         $user_status = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE user_id = %d AND group_id IN ( {$group_ids} ) AND is_confirmed = 1 AND is_banned = 0", $bp->loggedin_user->id ) );
         for ( $i = 0; $i < count( $paged_groups ); $i++ ) {
+            $paged_groups[$i]->is_member = false;
+
             foreach ( (array)$user_status as $group_id ) {
                 if ( $group_id == $paged_groups[$i]->id )
@@ -535 +537 @@
         $user_banned = $wpdb->get_col( $wpdb->prepare( "SELECT group_id FROM {$bp->groups->table_name_members} WHERE is_banned = 1 AND user_id = %d AND group_id IN ( {$group_ids} )", $bp->loggedin_user->id ) );
         for ( $i = 0; $i < count( $paged_groups ); $i++ ) {
+            $paged_groups[$i]->is_banned = false;
+
             foreach ( (array)$user_banned as $group_id ) {
                 if ( $group_id == $paged_groups[$i]->id )

trunk/bp-groups/bp-groups-templatetags.php

@@ -1024 +1024 @@
  *
  * If this function is invoked inside the groups template loop (e.g. the group directory), then
- * $groups_template->group->is_banned is set if the user is banned, so use that instead of making
- * another SQL query.
+ * check $groups_template->group->is_banned instead of making another SQL query.
+ * However, if used in a single group's pages, we must use groups_is_user_banned().
  *
  * @global object $bp BuddyPress global settings
@@ -1034 +1034 @@
  * @since 1.3
  */
-function bp_group_is_user_banned( $group = false, $user_id = false ) {
+function bp_group_is_user_banned( $group = false, $user_id = 0 ) {
     global $bp, $groups_template;
 
@@ -1044 +1044 @@
         $group =& $groups_template->group;
 
-        if ( !$user_id && !empty( $group->is_banned ) )
-            return apply_filters( 'bp_group_is_member_banned', true );
+        if ( !$user_id && isset( $group->is_banned ) )
+            return apply_filters( 'bp_group_is_user_banned', $group->is_banned );
     }