Ticket #8481: 8481.patch

src/bp-core/bp-core-taxonomy.php

@@ -167 +167 @@
                 }
 
                 $site_terms = wp_get_object_terms( $object_ids, $site_taxonomies, $args );
-                $retval     = array_merge( $retval, $site_terms );
+
+                if ( ! is_wp_error( $site_terms ) ) {
+                        $retval = array_merge( $retval, $site_terms );
+                }
 
                 if ( $switched ) {
                         restore_current_blog();

src/bp-core/classes/class-bp-user-query.php

@@ -253 +253 @@
                         'limit'   => ''
                 );
 
+                if ( ! isset( $bp->members->table_name_last_activity ) || ! $bp->members->table_name_last_activity ) {
+                        $bp->members->table_name_last_activity = bp_core_get_table_prefix() . 'bp_activity';
+                }
+
                 /* TYPE **************************************************************/
 
                 // Determines the sort order, which means it also determines where the