Changeset 9976 for trunk/src/bp-members/bp-members-template.php

Timestamp:

06/29/2015 02:58:47 PM (10 years ago)

Author:

boonebgorges

Message:

Add 'member_typein' and 'member_typenot_in' support to bp_has_members() stack.

Props lakrisgubben.
Fixes #6418.

File:

• trunk/src/bp-members/bp-members-template.php (modified) (5 diffs)

trunk/src/bp-members/bp-members-template.php

@@ -319 +319 @@
      *                                      Default: 'upage'.
      * @param array|string $member_type     Array or comma-separated string of member types to limit results to.
-     */
-    function __construct( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude, $meta_key, $meta_value, $page_arg = 'upage', $member_type = '' ) {
+     * @param array|string $member_type__in     Array or comma-separated string of member types to limit results to.
+     * @param array|string $member_type__not_in     Array or comma-separated string of member types to exclude from results.
+     */
+    function __construct( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude, $meta_key, $meta_value, $page_arg = 'upage', $member_type = '', $member_type__in = '', $member_type__not_in = '' ) {
 
         $this->pag_arg  = sanitize_key( $page_arg );
@@ -330 +332 @@
             $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page, $populate_extras, $exclude );
         else
-            $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'include' => $include, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras, 'exclude' => $exclude, 'meta_key' => $meta_key, 'meta_value' => $meta_value, 'member_type' => $member_type ) );
+            $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'include' => $include, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras, 'exclude' => $exclude, 'meta_key' => $meta_key, 'meta_value' => $meta_value, 'member_type' => $member_type, 'member_type__in' => $member_type__in, 'member_type__not_in' => $member_type__not_in ) );
 
         if ( !$max || $max >= (int) $this->members['total'] )
@@ -524 +526 @@
  *                                                  displayed user. Otherwise defaults to 0.
  *     @type string|array          $member_type     Array or comma-separated list of member types to limit results to.
+ *     @type string|array          $member_type__in     Array or comma-separated list of member types to limit results to.
+ *     @type string|array          $member_type__not_in     Array or comma-separated list of member types to exclude from results.
  *     @type string                $search_terms    Limit results by a search term. Default: null.
  *     @type string                $meta_key        Limit results by the presence of a usermeta key.
@@ -569 +573 @@
         'user_id'         => $user_id, // Pass a user_id to only show friends of this user
         'member_type'     => $member_type,
+        'member_type__in'     => '',
+        'member_type__not_in'     => '',
         'search_terms'    => null,     // Pass search_terms to filter users by their profile data
 
@@ -605 +611 @@
         $r['meta_value'],
         $r['page_arg'],
-        $r['member_type']
+        $r['member_type'],
+        $r['member_type__in'],
+        $r['member_type__not_in']
     );