<!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][4630] trunk/bp-core: Introduces bp_is_multiblog_mode() to reduce BP_ENABLE_MULTIBLOG checks throughout.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd>4630</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-07-09 19:14:50 +0000 (Sat, 09 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduces bp_is_multiblog_mode() to reduce BP_ENABLE_MULTIBLOG checks throughout. See #3314</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecatchuriphp">trunk/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-catchuri.php (4629 => 4630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2011-07-09 19:01:19 UTC (rev 4629)
+++ trunk/bp-core/bp-core-catchuri.php 2011-07-09 19:14:50 UTC (rev 4630)
</span><span class="lines">@@ -33,11 +33,9 @@
</span><span class="cx"> $bp->current_component = $bp->current_action = $bp->current_item ='';
</span><span class="cx"> $bp->action_variables = $bp->displayed_user->id = '';
</span><span class="cx">
</span><del>- // Only catch URI's on the root blog if we are not running
- // on multiple blogs
- if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && is_multisite() ) {
- if ( bp_get_root_blog_id() != (int) $wpdb->blogid )
- return false;
</del><ins>+ // Don't catch URIs on non-root blogs unless multiblog mode is on
+ if ( !bp_is_root_blog() && !bp_is_multiblog_mode() ) {
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Fetch all the WP page names for each component
</span><span class="lines">@@ -66,7 +64,7 @@
</span><span class="cx"> if ( empty( $bp_uri[$key] ) ) unset( $bp_uri[$key] );
</span><span class="cx">
</span><span class="cx"> // Running off blog other than root
</span><del>- if ( is_multisite() && !is_subdomain_install() && ( defined( 'BP_ENABLE_MULTIBLOG' ) || 1 != bp_get_root_blog_id() ) ) {
</del><ins>+ if ( is_multisite() && !is_subdomain_install() && ( bp_is_multiblog_mode() || 1 != bp_get_root_blog_id() ) ) {
</ins><span class="cx">
</span><span class="cx"> // Any subdirectory names must be removed from $bp_uri.
</span><span class="cx"> // This includes two cases: (1) when WP is installed in a subdirectory,
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (4629 => 4630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-07-09 19:01:19 UTC (rev 4629)
+++ trunk/bp-core/bp-core-functions.php 2011-07-09 19:14:50 UTC (rev 4630)
</span><span class="lines">@@ -80,10 +80,8 @@
</span><span class="cx"> $page_ids = bp_get_option( 'bp-pages' );
</span><span class="cx">
</span><span class="cx"> // Upgrading from an earlier version of BP pre-1.3
</span><del>- if ( !isset( $page_ids['members'] ) && $ms_page_ids = get_site_option( 'bp-pages' ) ) {
- $is_enable_multiblog = is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ? true : false;
-
- $page_blog_id = $is_enable_multiblog ? get_current_blog_id() : bp_get_root_blog_id();
</del><ins>+ if ( !isset( $page_ids['members'] ) && $ms_page_ids = get_site_option( 'bp-pages' ) ) {
+ $page_blog_id = bp_is_multiblog_mode() ? get_current_blog_id() : bp_get_root_blog_id();
</ins><span class="cx">
</span><span class="cx"> if ( isset( $ms_page_ids[$page_blog_id] ) ) {
</span><span class="cx"> $page_ids = $ms_page_ids[$page_blog_id];
</span><span class="lines">@@ -127,7 +125,7 @@
</span><span class="cx"> // Get pages and IDs
</span><span class="cx"> if ( $page_ids = bp_core_get_page_meta() ) {
</span><span class="cx">
</span><del>- $posts_table_name = is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ? $wpdb->get_blog_prefix( bp_get_root_blog_id() ) . 'posts' : $wpdb->posts;
</del><ins>+ $posts_table_name = bp_is_multiblog_mode() ? $wpdb->get_blog_prefix( bp_get_root_blog_id() ) . 'posts' : $wpdb->posts;
</ins><span class="cx"> $page_ids_sql = implode( ',', (array)$page_ids );
</span><span class="cx"> $page_names = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_name, post_parent, post_title FROM {$posts_table_name} WHERE ID IN ({$page_ids_sql}) AND post_status = 'publish' " ) );
</span><span class="cx">
</span><span class="lines">@@ -190,7 +188,7 @@
</span><span class="cx"> function bp_core_do_network_admin() {
</span><span class="cx"> $do_network_admin = false;
</span><span class="cx">
</span><del>- if ( is_multisite() && ( !defined( 'BP_ENABLE_MULTIBLOG' ) || !BP_ENABLE_MULTIBLOG ) )
</del><ins>+ if ( is_multisite() && !bp_is_multiblog_mode() )
</ins><span class="cx"> $do_network_admin = true;
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_do_network_admin', $do_network_admin );
</span><span class="lines">@@ -1090,12 +1088,12 @@
</span><span class="cx"> if ( !defined( 'BP_ROOT_BLOG' ) ) {
</span><span class="cx">
</span><span class="cx"> // Root blog is the main site on this network
</span><del>- if ( is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ) {
</del><ins>+ if ( is_multisite() && !bp_is_multiblog_mode() ) {
</ins><span class="cx"> $current_site = get_current_site();
</span><span class="cx"> $root_blog_id = $current_site->blog_id;
</span><span class="cx">
</span><del>- // Root blog is every site on this network
- } elseif ( is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) ) {
</del><ins>+ // Root blog is whatever the current site is (could be any site on the network)
+ } elseif ( is_multisite() && bp_is_multiblog_mode() ) {
</ins><span class="cx"> $root_blog_id = get_current_blog_id();
</span><span class="cx">
</span><span class="cx"> // Root blog is the only blog on this network
</span><span class="lines">@@ -1212,6 +1210,30 @@
</span><span class="cx"> return apply_filters( 'bp_is_username_compatibility_mode', defined( 'BP_ENABLE_USERNAME_COMPATIBILITY_MODE' ) && BP_ENABLE_USERNAME_COMPATIBILITY_MODE );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Are we running multiblog mode?
+ *
+ * Note that BP_ENABLE_MULTIBLOG is different from (but dependent on) WP Multisite. "Multiblog" is
+ * a BP setup that allows BP content to be viewed in the theme, and with the URL, of every blog
+ * on the network. Thus, instead of having all 'boonebgorges' links go to
+ * http://example.com/members/boonebgorges
+ * on the root blog, each blog will have its own version of the same profile content, eg
+ * http://site2.example.com/members/boonebgorges (for subdomains)
+ * http://example.com/site2/members/boonebgorges (for subdirectories)
+ *
+ * Multiblog mode is disabled by default, meaning that all BP content must be viewed on the root
+ * blog.
+ *
+ * @package BuddyPress
+ * @since 1.3
+ *
+ * @uses apply_filters() Filter 'bp_is_multiblog_mode' to alter
+ * @return bool False when multiblog mode is disabled (default); true when enabled
+ */
+function bp_is_multiblog_mode() {
+ return apply_filters( 'bp_is_multiblog_mode', is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG );
+}
+
</ins><span class="cx"> /** Global Manipulators *******************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>