Skip to:
Content

BuddyPress.org

Changeset 10913


Ignore:
Timestamp:
06/28/2016 07:54:07 PM (3 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bp-core/classes/class-bp-user-query.php

    r10872 r10913  
    798798        $sql_clauses = $tax_query->get_sql( 'u', $this->uid_name );
    799799
    800         if ( $switched ) {
    801             restore_current_blog();
    802         }
    803 
    804800        $clause = '';
    805801
     
    817813        }
    818814
     815        if ( $switched ) {
     816            restore_current_blog();
     817        }
     818
    819819        return $clause;
    820820    }
  • trunk/src/bp-groups/classes/class-bp-groups-group.php

    r10872 r10913  
    16451645        $sql_clauses = $tax_query->get_sql( 'g', 'id' );
    16461646
    1647         if ( $switched ) {
    1648             restore_current_blog();
    1649         }
    1650 
    16511647        $clause = '';
    16521648
     
    16641660        }
    16651661
     1662        if ( $switched ) {
     1663            restore_current_blog();
     1664        }
     1665
    16661666        return $clause;
    16671667    }
Note: See TracChangeset for help on using the changeset viewer.