Changeset 10913

Timestamp:

06/28/2016 07:54:07 PM (8 years ago)

Author:

r-a-y

Message:

Taxonomy: Fix usage of restore_current_blog() when using bp_get_taxonomy_term_site_id().

See #7077 where we introduced bp_get_taxonomy_term_site_id().

Props remkla.

Fixes #7142, #7144 (trunk).

Location:

trunk/src

Files:

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

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

@@ -798 +798 @@
         $sql_clauses = $tax_query->get_sql( 'u', $this->uid_name );
 
-        if ( $switched ) {
-            restore_current_blog();
-        }
-
         $clause = '';
 
@@ -817 +813 @@
         }
 
+        if ( $switched ) {
+            restore_current_blog();
+        }
+
         return $clause;
     }

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

@@ -1645 +1645 @@
         $sql_clauses = $tax_query->get_sql( 'g', 'id' );
 
-        if ( $switched ) {
-            restore_current_blog();
-        }
-
         $clause = '';
 
@@ -1664 +1660 @@
         }
 
+        if ( $switched ) {
+            restore_current_blog();
+        }
+
         return $clause;
     }