Changeset 2925 for trunk/bp-core/bp-core-templatetags.php

Timestamp:

04/15/2010 11:59:40 AM (14 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk.

File:

• trunk/bp-core/bp-core-templatetags.php (modified) (2 diffs)

trunk/bp-core/bp-core-templatetags.php

@@ -27 +27 @@
         if ( isset( $_REQUEST['letter'] ) && '' != $_REQUEST['letter'] ) {
             $this->members = BP_Core_User::get_users_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page, $populate_extras );
-        }
-        else if ( false !== $include ) {
-            $this->members = BP_Core_User::get_specific_users( $include, $this->pag_num, $this->pag_page, $populate_extras );
-        }
-        else {
-            $this->members = bp_core_get_users( array( 'type' => $this->type, 'per_page' => $this->pag_num, 'page' => $this->pag_page, 'user_id' => $user_id, 'search_terms' => $search_terms, 'populate_extras' => $populate_extras ) );
+        } 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 ) );
         }
 
@@ -159 +155 @@
     }
 
+    /* Make sure we return no members if we looking at friendship requests and there are none. */
+    if ( empty( $include ) && $bp->friends->slug == $bp->current_component && 'requests' == $bp->current_action )
+        return false;
+
     $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras );
-
-    return $members_template->has_members();
+    return apply_filters( 'bp_has_members', $members_template->has_members(), &$members_template );
 }