Ticket #7077: 7077.patch

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

@@ -50 +50 @@
  * @since 2.2.0
  *
  * @see wp_set_object_terms() for a full description of function and parameters.
+ * @uses apply_filters() Calls 'bp_taxonomy_scope.
  *
  * @param int          $object_id Object ID.
  * @param string|array $terms     Term or terms to set.
  * @param string       $taxonomy  Taxonomy name.
  * @param bool         $append    Optional. True to append terms to existing terms. Default: false.
+ * @param string       $scope     Local, Network or Global
  * @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();
+function bp_set_object_terms( $object_id, $terms, $taxonomy, $append = false, $scope = 'network' ) { 
+        $starting_blog_id =  get_current_blog_id();
+
+        $scope = apply_filters( "bp_taxonomy_${taxonomy}_scope", $scope );
+
+        switch ( $scope ) {
+                case 'local':
+                        $target_blog_id = $starting_blog_id;
+                break;
+                case 'network':
+                        $target_blog_id = bp_get_root_blog_id();
+                break;
+                case 'global':
+                        $main_network = wp_get_network( get_main_network_id() );
+                        $target_blog_id = get_site_by_path( $main_network->domain, $main_network->path );
+                break;
+        }
 
-        if ( ! $is_root_blog ) {
-                switch_to_blog( bp_get_root_blog_id() );
+        if ( $starting_blog_id !== $target_blog_id ) {
+                switch_to_blog( $target_blog_id );
                 bp_register_taxonomies();
         }
-
+ 
         $retval = wp_set_object_terms( $object_id, $terms, $taxonomy, $append );
-
-        if ( ! $is_root_blog ) {
+ 
+        if ( $starting_blog_id !== $target_blog_id ) {
                 restore_current_blog();
         }
 
@@ -80 +97 @@
  * @since 2.2.0
  *
  * @see wp_get_object_terms() for a full description of function and parameters.
+ * @uses apply_filters() Calls 'bp_taxonomy_scope.
  *
  * @param int|array    $object_ids ID or IDs of objects.
  * @param string|array $taxonomies Name or names of taxonomies to match.
  * @param array        $args       See {@see wp_get_object_terms()}.
+ * @param string       $scope     Local, Network or Global
  * @return array
  */
-function bp_get_object_terms( $object_ids, $taxonomies, $args = array() ) {
-        $is_root_blog = bp_is_root_blog();
+function bp_get_object_terms( $object_ids, $taxonomies, $args = array(), $scope = 'network' ) {
+        $starting_blog_id =  get_current_blog_id();
 
-        if ( ! $is_root_blog ) {
-                switch_to_blog( bp_get_root_blog_id() );
-                bp_register_taxonomies();
+        if ( ! is_array( $taxonomies ) ) { // If we want to handle an array here then all results should match otherwise ignore the results.
+                $scope = apply_filters( "bp_taxonomy_${taxonomies}_scope", $scope );
         }
 
+        switch ( $scope ) {
+                case 'local':
+                        $target_blog_id = $starting_blog_id;
+                break;
+                case 'network':
+                        $target_blog_id = bp_get_root_blog_id();
+                break;
+                case 'global':
+                        $main_network = wp_get_network( get_main_network_id() );
+                        $target_blog_id = get_site_by_path( $main_network->domain, $main_network->path );
+                break;
+        }
+
+        if ( $starting_blog_id !== $target_blog_id ) {
+                switch_to_blog( $target_blog_id );
+                bp_register_taxonomies();
+        }
+
         $retval = wp_get_object_terms( $object_ids, $taxonomies, $args );
 
-        if ( ! $is_root_blog ) {
-                restore_current_blog();
-        }
+        if ( $starting_blog_id !== $target_blog_id ) {
+                restore_current_blog();
+        }
 
         return $retval;
 }
@@ -109 +145 @@
  * @since 2.3.0
  *
  * @see wp_remove_object_terms() for a full description of function and parameters.
+ * @uses apply_filters() Calls 'bp_taxonomy_scope.
  *
  * @param int          $object_id Object ID.
  * @param string|array $terms     Term or terms to remove.
  * @param string       $taxonomy  Taxonomy name.
+ * @param string       $scope     Local, Network or Global
  * @return bool|WP_Error True on success, false or WP_Error on failure.
  */
-function bp_remove_object_terms( $object_id, $terms, $taxonomy ) {
-        $is_root_blog = bp_is_root_blog();
-
-        if ( ! $is_root_blog ) {
-                switch_to_blog( bp_get_root_blog_id() );
-                bp_register_taxonomies();
-        }
+function bp_remove_object_terms( $object_id, $terms, $taxonomy, $scope = 'network' ) {
+        $starting_blog_id =  get_current_blog_id();
+
+        $scope = apply_filters( "bp_taxonomy_${taxonomy}_scope", $scope );
+
+        switch ( $scope ) {
+                case 'local':
+                        $target_blog_id = $starting_blog_id;
+                break;
+                case 'network':
+                        $target_blog_id = bp_get_root_blog_id();
+                break;
+                case 'global':
+                        $main_network = wp_get_network( get_main_network_id() );
+                        $target_blog_id = get_site_by_path( $main_network->domain, $main_network->path );
+                break;
+        }
+
+        if ( $starting_blog_id !== $target_blog_id ) {
+                switch_to_blog( $target_blog_id );
+                bp_register_taxonomies();
+        }
 
         $retval = wp_remove_object_terms( $object_id, $terms, $taxonomy );
 
-        if ( ! $is_root_blog ) {
-                restore_current_blog();
-        }
+        if ( $starting_blog_id !== $target_blog_id ) {
+                restore_current_blog();
+        }
 
         return $retval;
 }