Changeset 2923

Timestamp:

04/14/2010 05:01:52 PM (15 years ago)

Author:

apeatling

Message:

Fix incorrect hooks in template. Fix issues with ordering when getting specific users via the members loop.

Location:

branches/1.2

Files:

• bp-core.php (modified) (2 diffs)
• bp-core/bp-core-classes.php (modified) (3 diffs)
• bp-core/bp-core-templatetags.php (modified) (2 diffs)
• bp-core/bp-core-wpabstraction.php (modified) (1 diff)
• bp-themes/bp-default/members/single/home.php (modified) (1 diff)

branches/1.2/bp-core.php

@@ -532 +532 @@
         'search_terms' => false, // Limit to users that match these search terms
 
+        'include' => false, // Pass comma separated list of user_ids to limit to only these users
         'per_page' => 20, // The number of results to return per page
         'page' => 1, // The page to return if limiting per page
@@ -540 +541 @@
     extract( $params, EXTR_SKIP );
 
-    return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $search_terms, $populate_extras ), &$params );
+    return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $include, $search_terms, $populate_extras ), &$params );
 }
 

branches/1.2/bp-core/bp-core-classes.php

@@ -107 +107 @@
     /* Static Functions */
 
-    function get_users( $type, $limit = null, $page = 1, $user_id = false, $search_terms = false, $populate_extras = true ) {
+    function get_users( $type, $limit = null, $page = 1, $user_id = false, $include = false, $search_terms = false, $populate_extras = true ) {
         global $wpdb, $bp;
 
@@ -152 +152 @@
                 return false;
             }
+        }
+
+        if ( $include ) {
+            /* Unset previous user restriction SQL */
+            unset( $sql['where_friends'] );
+
+            if ( is_array( $include ) )
+                $uids = $wpdb->escape( implode( ',', (array)$include ) );
+            else
+                $uids = $wpdb->escape( $include );
+
+            if ( !empty( $uids ) )
+                $sql['where_users'] = "AND u.ID IN ({$uids})";
         }
 
@@ -254 +267 @@
     }
 
-    function get_specific_users( $user_ids, $limit = null, $page = 1, $populate_extras = true ) {
-        global $wpdb, $bp;
-
-        if ( $limit && $page )
-            $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-
-        $user_sql = " AND user_id IN ( " . $wpdb->escape( $user_ids ) . " ) ";
-        $status_sql = bp_core_get_status_sql();
-
-        $total_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', $wpdb->prepare( "SELECT COUNT(DISTINCT ID) FROM " . CUSTOM_USER_TABLE . " WHERE {$status_sql} AND ID IN ( " . $wpdb->escape( $user_ids ) . " ) " ), $wpdb->escape( $user_ids ) );
-        $paged_users_sql = apply_filters( 'bp_core_get_specific_users_count_sql', $wpdb->prepare( "SELECT DISTINCT ID as id, user_registered, user_nicename, user_login, user_email FROM " . CUSTOM_USER_TABLE . " WHERE {$status_sql} AND ID IN ( " . $wpdb->escape( $user_ids ) . " ) {$pag_sql}" ), $wpdb->escape( $user_ids ) );
-
-        $total_users = $wpdb->get_var( $total_users_sql );
-        $paged_users = $wpdb->get_results( $paged_users_sql );
-
-        /***
-         * Lets fetch some other useful data in a separate queries, this will be faster than querying the data for every user in a list.
-         * We can't add these to the main query above since only users who have this information will be returned (since the much of the data is in usermeta and won't support any type of directional join)
-         */
-
-        /* Add additional data to the returned results */
-        if ( $populate_extras )
-            $paged_users = BP_Core_User::get_user_extras( &$paged_users, &$user_ids );
-
-
-        return array( 'users' => $paged_users, 'total' => $total_users );
-    }
-
     function search_users( $search_terms, $limit = null, $page = 1, $populate_extras = true ) {
         global $wpdb, $bp;

branches/1.2/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 ) );
         }
 
@@ -160 +156 @@
 
     $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 );
 }
 

branches/1.2/bp-core/bp-core-wpabstraction.php

@@ -69 +69 @@
 
 if ( !function_exists( 'is_site_admin' ) ) {
-    function is_site_admin() {
+    function is_site_admin( $user_id = false ) {
         if ( current_user_can( 'manage_options' ) )
             return true;

branches/1.2/bp-themes/bp-default/members/single/home.php

@@ -15 +15 @@
                         <?php bp_get_displayed_user_nav() ?>
 
-                        <?php do_action( 'bp_members_directory_member_types' ) ?>
+                        <?php do_action( 'bp_member_options_nav' ) ?>
                     </ul>
                 </div>