<!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][7192] trunk/bp-loader.php: Refines the way that BP_ROOT_BLOG is calculated on multisite installations</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7192">7192</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-06-09 13:39:07 +0000 (Sun, 09 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refines the way that BP_ROOT_BLOG is calculated on multisite installations
BP was originally a 'network: true' plugin, making it possible to assume blog 1
as the default value of BP_ROOT_BLOG on a multisite installation, unless
otherwise declared. When the network-only restriction was lifted, it became
possible to activate BP only on a secondary site in a network, in which case
the default value 1 of BP_ROOT_BLOG no longer applies.
This changeset reworks the logic used to calculate BP_ROOT_BLOG, starting with
the assumption that it is the current blog, and only changing it to the
current site's blog_id (blog 1, in non-multi-network setups) when the plugin
is indeed network-activated.
This fixes a number of problems, notably one where it was impossible to set up
the bp-pages associations, because the Pages dropdowns were populated from blog
1 when BP was active only on a secondary blog of a network.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4917">#4917</a>
Props r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbploaderphp">trunk/bp-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (7191 => 7192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2013-06-07 11:33:57 UTC (rev 7191)
+++ trunk/bp-loader.php 2013-06-09 13:39:07 UTC (rev 7192)
</span><span class="lines">@@ -223,30 +223,12 @@
</span><span class="cx"> if ( file_exists( WP_PLUGIN_DIR . '/bp-custom.php' ) )
</span><span class="cx"> require( WP_PLUGIN_DIR . '/bp-custom.php' );
</span><span class="cx">
</span><del>- // Define on which blog ID BuddyPress should run
- if ( !defined( 'BP_ROOT_BLOG' ) ) {
-
- // Default to 1
- $root_blog_id = 1;
-
- // Root blog is the main site on this network
- if ( is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ) {
- $current_site = get_current_site();
- $root_blog_id = $current_site->blog_id;
-
- // Root blog is every site on this network
- } elseif ( is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) ) {
- $root_blog_id = get_current_blog_id();
- }
-
- define( 'BP_ROOT_BLOG', $root_blog_id );
- }
-
</del><span class="cx"> // Path and URL
</span><del>- if ( !defined( 'BP_PLUGIN_DIR' ) )
</del><ins>+ if ( ! defined( 'BP_PLUGIN_DIR' ) ) {
</ins><span class="cx"> define( 'BP_PLUGIN_DIR', trailingslashit( WP_PLUGIN_DIR . '/buddypress' ) );
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( !defined( 'BP_PLUGIN_URL' ) ) {
</del><ins>+ if ( ! defined( 'BP_PLUGIN_URL' ) ) {
</ins><span class="cx"> $plugin_url = plugin_dir_url( __FILE__ );
</span><span class="cx">
</span><span class="cx"> // If we're using https, update the protocol. Workaround for WP13941, WP15928, WP19037.
</span><span class="lines">@@ -256,6 +238,40 @@
</span><span class="cx"> define( 'BP_PLUGIN_URL', $plugin_url );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Define on which blog ID BuddyPress should run
+ if ( ! defined( 'BP_ROOT_BLOG' ) ) {
+
+ // Default to use current blog ID
+ // Fulfills non-network installs and BP_ENABLE_MULTIBLOG installs
+ $root_blog_id = get_current_blog_id();
+
+ // Multisite check
+ if ( is_multisite() ) {
+
+ // Multiblog isn't enabled
+ if ( ! defined( 'BP_ENABLE_MULTIBLOG' ) || ( defined( 'BP_ENABLE_MULTIBLOG' ) && (int) constant( 'BP_ENABLE_MULTIBLOG' ) === 0 ) ) {
+ // Check to see if BP is network-activated
+ // We're not using is_plugin_active_for_network() b/c you need to include the
+ // /wp-admin/includes/plugin.php file in order to use that function.
+
+ // get network-activated plugins
+ $plugins = get_site_option( 'active_sitewide_plugins');
+
+ // basename
+ $basename = plugin_basename( constant( 'BP_PLUGIN_DIR' ) . 'bp-loader.php' );
+
+ // plugin is network-activated; use main site ID instead
+ if ( isset( $plugins[ $basename ] ) ) {
+ $current_site = get_current_site();
+ $root_blog_id = $current_site->blog_id;
+ }
+ }
+
+ }
+
+ define( 'BP_ROOT_BLOG', $root_blog_id );
+ }
+
</ins><span class="cx"> // The search slug has to be defined nice and early because of the way
</span><span class="cx"> // search requests are loaded
</span><span class="cx"> //
</span></span></pre>
</div>
</div>
</body>
</html>