Changeset 9519 for trunk/src/bp-core/bp-core-taxonomy.php

Timestamp:

02/20/2015 06:46:36 PM (12 years ago)

Author:

boonebgorges

Message:

In taxonomy functions, don't restore_current_blog() when not necessary.

Fixes #6240.

File:

• trunk/src/bp-core/bp-core-taxonomy.php (modified) (4 diffs)

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

@@ -38 +38 @@
  */
 function bp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
-        if ( ! bp_is_root_blog() ) {
+        $is_root_blog = bp_is_root_blog();
+
+        if ( ! $is_root_blog ) {
                 switch_to_blog( bp_get_root_blog_id() );
         }
@@ -44 +46 @@
         $retval = wp_set_object_terms( $object_id, $terms, $taxonomy, $append );
 
-        restore_current_blog();
+        if ( ! $is_root_blog ) {
+                restore_current_blog();
+        }
 
         return $retval;
@@ -62 +66 @@
  */
 function bp_get_object_terms( $object_ids, $taxonomies, $args = array() ) {
-        if ( ! bp_is_root_blog() ) {
+        $is_root_blog = bp_is_root_blog();
+
+        if ( ! $is_root_blog ) {
                 switch_to_blog( bp_get_root_blog_id() );
         }
@@ -68 +74 @@
         $retval = wp_get_object_terms( $object_ids, $taxonomies, $args );
 
-        restore_current_blog();
+        if ( ! $is_root_blog ) {
+                restore_current_blog();
+        }
 
         return $retval;