Changeset 3541 for trunk/bp-groups/bp-groups-templatetags.php

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

File:

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

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 );
     }