Changeset 840

Timestamp:

01/13/2009 12:13:56 AM (16 years ago)

Author:

apeatling

Message:

FIxes #308

Location:

trunk

Files:

• bp-core/bp-core-classes.php (modified) (1 diff)
• bp-groups.php (modified) (1 diff)
• bp-groups/bp-groups-classes.php (modified) (1 diff)

trunk/bp-core/bp-core-classes.php

@@ -167 +167 @@
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
-        $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT count(user_id) FROM {$wpdb->base_prefix}usermeta um WHERE meta_key = 'total_friend_count' ORDER BY RAND() DESC" ) );
-        $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$wpdb->base_prefix}usermeta um WHERE meta_key = 'total_friend_count' ORDER BY RAND(){$pag_sql}" ) );
+        $total_users = $wpdb->get_var( $wpdb->prepare( "SELECT count(user_id) FROM {$wpdb->base_prefix}usermeta um ORDER BY RAND() DESC" ) );
+        $paged_users = $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$wpdb->base_prefix}usermeta um ORDER BY RAND(){$pag_sql}" ) );
         
         return array( 'users' => $paged_users, 'total' => $total_users );

trunk/bp-groups.php

@@ -691 +691 @@
 
 function groups_screen_group_admin_requests() {
-    global $bp;
+    global $bp, $group_obj;
     
     if ( $bp['current_component'] == $bp['groups']['slug'] && $bp['action_variables'][0] == 'membership-requests' ) {
         
-        if ( !$bp['is_item_admin'] )
+        if ( !$bp['is_item_admin'] || $group_obj->status == 'public' )
             return false;
-            
+        
         // Remove any screen notifications
         bp_core_delete_notifications_for_user_by_type( $bp['loggedin_userid'], 'groups', 'new_membership_request' );

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

@@ -359 +359 @@
         if ( $limit && $page ) {
             $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
-            $total_requests = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM " . $bp['groups']['table_name_members'] . " WHERE group_id = %d AND is_confirmed = 0", $group_id ) );
-        }
-        
-        $paged_requests = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $bp['groups']['table_name_members'] . " WHERE group_id = %d AND is_confirmed = 0{$pag_sql}", $group_id ) );
+            $total_requests = $wpdb->get_var( $wpdb->prepare( "SELECT count(id) FROM " . $bp['groups']['table_name_members'] . " WHERE group_id = %d AND is_confirmed = 0 AND inviter_id = 0", $group_id ) );
+        }
+        
+        $paged_requests = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . $bp['groups']['table_name_members'] . " WHERE group_id = %d AND is_confirmed = 0 AND inviter_id = 0{$pag_sql}", $group_id ) );
 
         return array( 'requests' => $paged_requests, 'total' => $total_requests );