Changeset 1904

Timestamp:

09/21/2009 04:49:17 PM (17 years ago)

Author:

apeatling

Message:

Group fixes.

Location:

trunk

Files:

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

trunk/bp-core.php

@@ -623 +623 @@
 
         if ( $bp->current_component == $slug && !$bp->current_action ) {
-                if ( function_exists( $screen_function ) )
-                        add_action( 'wp', $function, 3 );
+                if ( !is_object( $screen_function[0] ) )
+                        add_action( 'wp', $screen_function, 3 );
+                else
+                        add_action( 'wp', array( &$screen_function[0], $screen_function[1] ), 3 );
 
                 if ( $default_subnav_slug )
@@ -726 +728 @@
                 
         if ( ( $bp->current_action == $slug && $bp->current_component == $parent_slug ) && $user_has_access ) {
-                if ( !is_object($screen_function[0]) )
+                if ( !is_object( $screen_function[0] ) )
                         add_action( 'wp', $screen_function, 3 );
                 else

trunk/bp-groups.php

@@ -1842 +1842 @@
 }
 
-function groups_get_user_groups( $pag_num, $pag_page ) {
-        global $bp;
-        
-        $groups = BP_Groups_Member::get_group_ids( $bp->displayed_user->id, $pag_num, $pag_page );
-
-        return array( 'groups' => $groups['ids'], 'total' => $groups['total'] );
+function groups_get_user_groups( $user_id = false, $pag_num = false, $pag_page = false ) {
+        global $bp;
+        
+        if ( !$user_id )
+                $user_id = $bp->displayed_user->id;
+        
+        return BP_Groups_Member::get_group_ids( $user_id, $pag_num, $pag_page );
 }
 

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

@@ -253 +253 @@
                 
                 // Get all the group ids for the current user's groups.
-                $gids = BP_Groups_Member::get_group_ids( $user_id, false, false, false, true );
-
+                $gids = BP_Groups_Member::get_group_ids( $user_id );
+                
                 if ( !$gids['groups'] )
                         return false;
@@ -621 +621 @@
         }
         
-        function get_group_ids( $user_id, $limit = false, $page = false, $get_total = true, $as_col = false ) {
+        function get_group_ids( $user_id, $limit = false, $page = false ) {
                 global $wpdb, $bp;
 
@@ -636 +636 @@
                 }
                 
-                if ( $as_col )
-                        $paged_groups = $wpdb->get_col( $group_sql );
-                else
-                        $paged_groups = $wpdb->get_results( $group_sql );
-
-                return array( 'groups' => $paged_groups, 'total' => $total_groups );
+                $groups = $wpdb->get_col( $group_sql );
+
+                return array( 'groups' => $groups, 'total' => (int) $total_groups );
         }