Ticket #3572: 3572.01.diff

bp-groups/bp-groups-classes.php

@@ -869 +869 @@
         function get_recently_joined( $user_id, $limit = false, $page = false, $filter = false ) {
                 global $wpdb, $bp;
 
-                $pag_sql = $hidden_sql = $filter_sql = '';
-
                 if ( $limit && $page )
                         $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
@@ -891 +889 @@
         function get_is_admin_of( $user_id, $limit = false, $page = false, $filter = false ) {
                 global $wpdb, $bp;
 
-                $pag_sql = $hidden_sql = $filter_sql = '';
-
                 if ( $limit && $page )
                         $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
@@ -913 +909 @@
         function get_is_mod_of( $user_id, $limit = false, $page = false, $filter = false ) {
                 global $wpdb, $bp;
 
-                $pag_sql = $hidden_sql = $filter_sql = '';
-
                 if ( $limit && $page )
                         $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 

bp-groups/bp-groups-functions.php

@@ -649 +649 @@
                 $member->save();
         }
 
-        do_action( 'groups_send_invites', $group_id, $invited_users );
+        do_action( 'groups_send_invites', $bp->groups->current_group->id, $invited_users );
 }
 
 function groups_get_invites_for_group( $user_id, $group_id ) {

bp-xprofile/bp-xprofile-classes.php

@@ -174 +174 @@
 
                                 // Loop through the results and find the fields that have data.
                                 foreach( (array)$field_data as $data ) {
-                                        if ( false !== $key = array_search( $data->field_id, $field_ids ) ) {
+                                        // Empty fields may contain a serialized empty array
+                                        $maybe_value = maybe_unserialize( $data->value );
+                                        if ( !empty( $maybe_value ) && false !== $key = array_search( $data->field_id, $field_ids ) ) {
                                                 // Fields that have data get removed from the list
                                                 unset( $field_ids[$key] );
                                         }