Ticket #7077: 7077.2.patch

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

@@ -45 +45 @@
 add_action( 'bp_register_taxonomies', 'bp_register_default_taxonomies' );
 
 /**
+ * Get the ID of the site that BP should use for taxonomy term storage.
+ *
+ * Defaults to the root blog ID.
+ *
+ * @return int
+ */
+function bp_get_taxonomy_term_site_id( $taxonomy = '' ) {
+        $site_id = bp_get_root_blog_id();
+
+        /**
+         * Filters the ID of the site where BP should store taxonomy terms.
+         *
+         * @param int    $site_id
+         * @param string $taxonomy
+         */
+        return (int) apply_filters( 'bp_get_taxonomy_term_site_id', $site_id, $taxonomy );
+}
+
+/**
  * Set taxonomy terms on a BuddyPress object.
  *
  * @since 2.2.0
@@ -58 +77 @@
  * @return array Array of term taxonomy IDs.
  */
 function bp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
-        $is_root_blog = bp_is_root_blog();
+        $site_id = bp_get_taxonomy_term_site_id( $taxonomy );
 
-        if ( ! $is_root_blog ) {
-                switch_to_blog( bp_get_root_blog_id() );
+        $switched = false;
+        if ( $site_id !== get_current_blog_id() ) {
+                switch_to_blog( $site_id );
                 bp_register_taxonomies();
+                $switched = true;
         }
 
         $retval = wp_set_object_terms( $object_id, $terms, $taxonomy, $append );
 
-        if ( ! $is_root_blog ) {
+        if ( ! $switched ) {
                 restore_current_blog();
         }