Changeset 10872

Timestamp:

06/02/2016 04:59:49 PM (9 years ago)

Author:

boonebgorges

Message:

Use bp_get_taxonomy_term_site_id() when switching to generate tax queries for member and group types.

Props Offereins.
See #7077.

Location:

trunk/src

Files:

• bp-core/classes/class-bp-user-query.php (modified) (1 diff)
• bp-groups/classes/class-bp-groups-group.php (modified) (1 diff)

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

@@ -789 +789 @@
 
         // Switch to the root blog, where member type taxonomies live.
+        $site_id  = bp_get_taxonomy_term_site_id( 'bp_member_type' );
         $switched = false;
-        if ( ! bp_is_root_blog() ) {
-            switch_to_blog( bp_get_root_blog_id() );
+        if ( $site_id !== get_current_blog_id() ) {
+            switch_to_blog( $site_id );
             $switched = true;
         }

trunk/src/bp-groups/classes/class-bp-groups-group.php

@@ -1636 +1636 @@
         ) );
 
+        $site_id  = bp_get_taxonomy_term_site_id( 'bp_group_type' );
         $switched = false;
-        if ( ! bp_is_root_blog() ) {
-            switch_to_blog( bp_get_root_blog_id() );
+        if ( $site_id !== get_current_blog_id() ) {
+            switch_to_blog( $site_id );
             $switched = true;
         }