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

Timestamp:

03/30/2015 06:41:38 PM (9 years ago)

Author:

boonebgorges

Message:

Better logic for blog switching when processing member type tax query.

File:

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

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

@@ -446 +446 @@
 
                 // Switch to the root blog, where member type taxonomies live.
-                switch_to_blog( bp_get_root_blog_id() );
+                $switched = false;
+                if ( ! bp_is_root_blog() ) {
+                    switch_to_blog( bp_get_root_blog_id() );
+                    $switched = true;
+                }
 
                 $member_type_sql_clauses = $member_type_tq->get_sql( 'u', $this->uid_name );
-                restore_current_blog();
-
-
+
+                if ( $switched ) {
+                    restore_current_blog();
+                }
 
                 // Grab the first term_relationships clause and convert to a subquery.