<!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][5716] trunk: Add root_blog_id variable to $bp global, and remove extra logic from bp_get_root_blog_id().</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><a href="http://buddypress.trac.wordpress.org/changeset/5716">5716</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-02-11 06:01:03 +0000 (Sat, 11 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add root_blog_id variable to $bp global, and remove extra logic from bp_get_root_blog_id().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbploaderphp">trunk/bp-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (5715 => 5716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2012-02-11 05:36:07 UTC (rev 5715)
+++ trunk/bp-core/bp-core-functions.php 2012-02-11 06:01:03 UTC (rev 5716)
</span><span class="lines">@@ -527,8 +527,9 @@
</span><span class="cx"> * @uses bp_core_time_since() This function will return an English representation of the time elapsed.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_get_last_activity( $last_activity_date, $string ) {
</span><del>- if ( !$last_activity_date || empty( $last_activity_date ) )
- $last_active = __( 'not recently active', 'buddypress' );
</del><ins>+
+ if ( empty( $last_activity_date ) )
+ $last_active = __( 'Not recently active', 'buddypress' );
</ins><span class="cx"> else
</span><span class="cx"> $last_active = sprintf( $string, bp_core_time_since( $last_activity_date ) );
</span><span class="cx">
</span><span class="lines">@@ -806,43 +807,21 @@
</span><span class="cx"> if ( $blog_id == bp_get_root_blog_id() )
</span><span class="cx"> $is_root_blog = true;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_is_root_blog', (bool) $is_root_blog );
</del><ins>+ return (bool) apply_filters( 'bp_is_root_blog', (bool) $is_root_blog );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Is this bp_get_root_blog_id()?
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress
</span><del>- * @since 1.5
</del><ins>+ * @since BuddyPress (1.5)
</ins><span class="cx"> *
</span><del>- * @return bool $is_root_blog Returns true if this is bp_get_root_blog_id().
</del><ins>+ * @return int Return the root site ID
</ins><span class="cx"> */
</span><span class="cx"> function bp_get_root_blog_id() {
</span><ins>+ global $bp;
</ins><span class="cx">
</span><del>- // Default to 1
- $root_blog_id = 1;
-
- // Define on which blog ID BuddyPress should run
- if ( !defined( 'BP_ROOT_BLOG' ) ) {
-
- // Root blog is the main site on this network
- if ( is_multisite() && !bp_is_multiblog_mode() ) {
- $current_site = get_current_site();
- $root_blog_id = $current_site->blog_id;
-
- // Root blog is whatever the current site is (could be any site on the network)
- } elseif ( is_multisite() && bp_is_multiblog_mode() ) {
- $root_blog_id = get_current_blog_id();
- }
-
- define( 'BP_ROOT_BLOG', $root_blog_id );
-
- // Root blog is defined
- } else {
- $root_blog_id = BP_ROOT_BLOG;
- }
-
- return apply_filters( 'bp_get_root_blog_id', (int) $root_blog_id );
</del><ins>+ return (int) apply_filters( 'bp_get_root_blog_id', (int) $bp->root_blog_id );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (5715 => 5716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2012-02-11 05:36:07 UTC (rev 5715)
+++ trunk/bp-loader.php 2012-02-11 06:01:03 UTC (rev 5716)
</span><span class="lines">@@ -74,6 +74,13 @@
</span><span class="cx"> */
</span><span class="cx"> public $load_deprecated = true;
</span><span class="cx">
</span><ins>+ /** Root ******************************************************************/
+
+ /**
+ * @var int The root blog ID
+ */
+ public $root_blog_id = 1;
+
</ins><span class="cx"> /** Paths *****************************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -368,6 +375,11 @@
</span><span class="cx"> */
</span><span class="cx"> private function setup_globals() {
</span><span class="cx">
</span><ins>+ /** Root **************************************************************/
+
+ // BuddyPress Root blog ID
+ $this->root_blog_id = (int) apply_filters( 'bp_get_root_blog_id', BP_ROOT_BLOG );
+
</ins><span class="cx"> /** Paths *************************************************************/
</span><span class="cx">
</span><span class="cx"> // BuddyPress root directory
</span><span class="lines">@@ -428,18 +440,23 @@
</span><span class="cx">
</span><span class="cx"> // Get the possible DB versions
</span><span class="cx"> $versions = array();
</span><del>- $versions['1.2'] = get_site_option( 'bp-core-db-version' );
- $versions['1.5-multi'] = get_site_option( 'bp-db-version' );
- $versions['1.5-single'] = get_option ( 'bp-db-version' );
- $versions['1.6-multi'] = get_site_option( '_bp_db_version' );
- $versions['1.6-single'] = get_option ( '_bp_db_version' );
</del><ins>+ $versions['1.2'] = get_site_option( 'bp-core-db-version' );
+ $versions['1.5-multi'] = get_site_option( 'bp-db-version' );
+ $versions['1.6-multi'] = get_site_option( '_bp_db_version' );
+ $versions['1.5-single'] = get_blog_option( $this->root_blog_id, 'bp-db-version' );
+ $versions['1.6-single'] = get_blog_option( $this->root_blog_id, '_bp_db_version' );
</ins><span class="cx">
</span><span class="cx"> // Remove empty array items
</span><span class="cx"> $versions = array_filter( $versions );
</span><span class="cx">
</span><del>- // Get the largest version
- $this->db_version_raw = !empty( $versions ) ? (int) max( $versions ) : 0;
</del><ins>+ // If no 1.6-single exists, use the max of the others
+ if ( empty( $versions['1.6-single'] ) )
+ $this->db_version_raw = !empty( $versions ) ? (int) max( $versions ) : 0;
</ins><span class="cx">
</span><ins>+ // 1.6-single exists, so trust it
+ else
+ $this->db_version_raw = $versions['1.6-single'];
+
</ins><span class="cx"> // Is this an upgrade to WordPress Network Mode?
</span><span class="cx"> // We know by checking to see whether the db version is saved in sitemeta
</span><span class="cx"> if ( is_multisite() && ( empty( $versions['1.5-multi'] ) && empty( $versions['1.6-multi'] ) ) )
</span></span></pre>
</div>
</div>
</body>
</html>