<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][10818] trunk/src/bp-core/bp-core-taxonomy.php: Taxonomy: Allow the site used for taxonomy term storage to be filtered.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/10818">10818</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/10818","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-05-28 13:43:05 +0000 (Sat, 28 May 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Taxonomy: Allow the site used for taxonomy term storage to be filtered.
On some setups, it may be desirable to store the terms from a given BP taxonomy
on a site other than the default. For example, on a multi-network setup, where
users are shared between all networks, it may suit the purposes of the
installation better to have bp_member_type data stored on the primary network
and shared between networks.
The new function `bp_get_taxonomy_term_site_id()` function allows the value to
be filtered, on a taxonomy-specific basis. BP's taxonomy wrapper functions have
been updated to use this new function.
Props rekmla.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7077">#7077</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoretaxonomyphp">trunk/src/bp-core/bp-core-taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoretaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-taxonomy.php 2016-05-27 06:05:31 UTC (rev 10817)
+++ trunk/src/bp-core/bp-core-taxonomy.php 2016-05-28 13:43:05 UTC (rev 10818)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,6 +45,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_register_taxonomies', 'bp_register_default_taxonomies' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Gets the ID of the site that BP should use for taxonomy term storage.
+ *
+ * Defaults to the root blog ID.
+ *
+ * @since 2.6.0
+ *
+ * @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.
+ *
+ * @since 2.6.0
+ *
+ * @param int $site_id
+ * @param string $taxonomy
+ */
+ return (int) apply_filters( 'bp_get_taxonomy_term_site_id', $site_id, $taxonomy );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Set taxonomy terms on a BuddyPress object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.2.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,16 +81,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Array of term taxonomy IDs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_root_blog = bp_is_root_blog();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_id = bp_get_taxonomy_term_site_id( $taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $is_root_blog ) {
- switch_to_blog( bp_get_root_blog_id() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $switched = false;
+ if ( $site_id !== get_current_blog_id() ) {
+ switch_to_blog( $site_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_register_taxonomies();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $switched = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $retval = wp_set_object_terms( $object_id, $terms, $taxonomy, $append );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $is_root_blog ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $switched ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,17 +112,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_get_object_terms( $object_ids, $taxonomies, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_root_blog = bp_is_root_blog();
-
- if ( ! $is_root_blog ) {
- switch_to_blog( bp_get_root_blog_id() );
- bp_register_taxonomies();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Different taxonomies must be stored on different sites.
+ $taxonomy_site_map = array();
+ foreach ( (array) $taxonomies as $taxonomy ) {
+ $taxonomy_site_id = bp_get_taxonomy_term_site_id( $taxonomy );
+ $taxonomy_site_map[ $taxonomy_site_id ][] = $taxonomy;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $retval = wp_get_object_terms( $object_ids, $taxonomies, $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $retval = array();
+ foreach ( $taxonomy_site_map as $taxonomy_site_id => $site_taxonomies ) {
+ $switched = false;
+ if ( $taxonomy_site_id !== get_current_blog_id() ) {
+ switch_to_blog( $site_id );
+ bp_register_taxonomies();
+ $switched = true;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $is_root_blog ) {
- restore_current_blog();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_terms = wp_get_object_terms( $object_ids, $site_taxonomies, $args );
+ $retval = array_merge( $retval, $site_terms );
+
+ if ( ! $switched ) {
+ restore_current_blog();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $retval;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,16 +152,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool|WP_Error True on success, false or WP_Error on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_remove_object_terms( $object_id, $terms, $taxonomy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_root_blog = bp_is_root_blog();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $site_id = bp_get_taxonomy_term_site_id( $taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $is_root_blog ) {
- switch_to_blog( bp_get_root_blog_id() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $switched = false;
+ if ( $site_id !== get_current_blog_id() ) {
+ switch_to_blog( $site_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_register_taxonomies();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $switched = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $retval = wp_remove_object_terms( $object_id, $terms, $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $is_root_blog ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $switched ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>