Changeset 7145 for trunk/bp-groups/bp-groups-classes.php

Timestamp:

06/04/2013 03:04:29 AM (10 years ago)

Author:

boonebgorges

Message:

Deprecate exclude_banned arg of bp_group_has_members() in favor of 'banned' role

This changeset introduces support for the 'banned' group_role filter in
BP_Group_Member_Query. This takes the place of the exclude_banned parameter.
Backward compatibility for exclude_banned is added in
groups_get_group_members().

See #4977

File:

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

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

@@ -988 +988 @@
         // these defaults).
         $this->query_vars = wp_parse_args( $this->query_vars, array(
-            'group_id'       => 0,
-            'group_role'     => array( 'member' ),
-            'exclude_banned' => true,
+            'group_id'   => 0,
+            'group_role' => array( 'member' ),
         ) );
 
@@ -1051 +1050 @@
         // which there is no dedicated is_ column), figure out a list
         // of columns *not* to match
+        $roles_sql = '';
         if ( in_array( 'member', $roles ) ) {
             $role_columns = array();
@@ -1056 +1056 @@
                 $role_columns[] = 'is_' . $excluded_role . ' = 0';
             }
-            $roles_sql = '(' . implode( ' AND ', $role_columns ) . ')';
+
+            if ( ! empty( $role_columns ) ) {
+                $roles_sql = '(' . implode( ' AND ', $role_columns ) . ')';
+            }
 
         // When querying for a set of roles *not* containing 'member',
@@ -1065 +1068 @@
                 $role_columns[] = 'is_' . $role . ' = 1';
             }
-            $roles_sql = '(' . implode( ' OR ', $role_columns ) . ')';
+
+            if ( ! empty( $role_columns ) ) {
+                $roles_sql = '(' . implode( ' OR ', $role_columns ) . ')';
+            }
         }
 
         if ( ! empty( $roles_sql ) ) {
             $sql['where'][] = $roles_sql;
-        }
-
-        if ( ! empty( $this->query_vars['exclude_banned'] ) ) {
-            $sql['where'][] = "is_banned = 0";
         }