<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2274] trunk:
Change multiblog naming convention to multisite to avoid future confusion.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2274</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-06 21:24:41 +0000 (Wed, 06 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change multiblog naming convention to multisite to avoid future confusion.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
<li><a href="#trunkbpcorebpcoreactivationphp">trunk/bp-core/bp-core-activation.php</a></li>
<li><a href="#trunkbpcorebpcoreadminbarphp">trunk/bp-core/bp-core-adminbar.php</a></li>
<li><a href="#trunkbpcorebpcoreavatarsphp">trunk/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunkbpcorebpcorecatchuriphp">trunk/bp-core/bp-core-catchuri.php</a></li>
<li><a href="#trunkbpcorebpcoresignupphp">trunk/bp-core/bp-core-signup.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpcorebpcorewpabstractionphp">trunk/bp-core/bp-core-wpabstraction.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbpforumsbpforumsadminphp">trunk/bp-forums/bp-forums-admin.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfooterphp">trunk/bp-themes/bp-default/footer.php</a></li>
<li><a href="#trunkbpthemesbpdefaultheaderphp">trunk/bp-themes/bp-default/header.php</a></li>
<li><a href="#trunkbpthemesbpdefaultregistrationregisterphp">trunk/bp-themes/bp-default/registration/register.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (2273 => 2274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2010-01-06 20:44:44 UTC (rev 2273)
+++ trunk/bp-blogs.php 2010-01-06 21:24:41 UTC (rev 2274)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> function bp_blogs_check_installed() {
</span><span class="cx"> global $wpdb, $bp, $userdata;
</span><span class="cx">
</span><del>- if ( is_site_admin() && bp_core_is_multiblog_install() ) {
</del><ins>+ if ( is_site_admin() && bp_core_is_multisite() ) {
</ins><span class="cx"> /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
</span><span class="cx"> if ( get_site_option('bp-blogs-db-version') < BP_BLOGS_DB_VERSION )
</span><span class="cx"> bp_blogs_install();
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx">
</span><span class="cx"> /* Blog/post/comment menus should not appear on single WordPress setups. Although comments
</span><span class="cx"> and posts made by users will still show on their activity stream .*/
</span><del>- if ( !bp_core_is_multiblog_install() )
</del><ins>+ if ( !bp_core_is_multisite() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* Add 'Blogs' to the main navigation */
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> function bp_blogs_directory_blogs_setup() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( bp_core_is_multiblog_install() && $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
</del><ins>+ if ( bp_core_is_multisite() && $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
</ins><span class="cx"> $bp->is_directory = true;
</span><span class="cx">
</span><span class="cx"> do_action( 'bp_blogs_directory_blogs_setup' );
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> function bp_blogs_screen_my_blogs() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !bp_core_is_multiblog_install() )
</del><ins>+ if ( !bp_core_is_multisite() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> do_action( 'bp_blogs_screen_my_blogs' );
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> function bp_blogs_screen_create_a_blog() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !bp_core_is_multiblog_install() || $bp->current_component != $bp->blogs->slug || 'create' != $bp->current_action )
</del><ins>+ if ( !bp_core_is_multisite() || $bp->current_component != $bp->blogs->slug || 'create' != $bp->current_action )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( !is_user_logged_in() || !bp_blog_signup_enabled() )
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> if ( 'publish' == $post->post_status && '' == $post->post_password ) {
</span><span class="cx">
</span><span class="cx"> /* If we're on a multiblog install, record this post */
</span><del>- if ( bp_core_is_multiblog_install() ) {
</del><ins>+ if ( bp_core_is_multisite() ) {
</ins><span class="cx"> $recorded_post = new BP_Blogs_Post;
</span><span class="cx"> $recorded_post->user_id = $user_id;
</span><span class="cx"> $recorded_post->blog_id = $blog_id;
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', time() );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
</del><ins>+ if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
</ins><span class="cx"> /* Record this in activity streams */
</span><span class="cx"> $post_permalink = bp_post_get_permalink( $post, $blog_id );
</span><span class="cx">
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> bp_blogs_record_post( $post_id );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
</del><ins>+ if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
</ins><span class="cx"> /* Now re-record the post in the activity streams */
</span><span class="cx"> $post_permalink = bp_post_get_permalink( $post, $blog_id );
</span><span class="cx">
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* If we're on a multiblog install, record this post */
</span><del>- if ( bp_core_is_multiblog_install() ) {
</del><ins>+ if ( bp_core_is_multisite() ) {
</ins><span class="cx"> $recorded_comment = new BP_Blogs_Comment;
</span><span class="cx"> $recorded_comment->user_id = $user_id;
</span><span class="cx"> $recorded_comment->blog_id = $wpdb->blogid;
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> bp_blogs_update_blogmeta( $recorded_comment->blog_id, 'last_activity', time() );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
</del><ins>+ if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
</ins><span class="cx"> /* Record in activity streams */
</span><span class="cx"> $comment_link = bp_post_get_permalink( $comment->post, $wpdb->blogid ) . '#comment-' . $comment_id;
</span><span class="cx"> $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx">
</span><span class="cx"> bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'secondary_item_id' => $recorded_comment->blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_comment' ) );
</span><span class="cx">
</span><del>- if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
</del><ins>+ if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
</ins><span class="cx"> /* Record in activity streams */
</span><span class="cx"> $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
</span><span class="cx"> $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $recorded_comment->user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
</span></span></pre></div>
<a id="trunkbpcorebpcoreactivationphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-activation.php (2273 => 2274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-activation.php 2010-01-06 20:44:44 UTC (rev 2273)
+++ trunk/bp-core/bp-core-activation.php 2010-01-06 21:24:41 UTC (rev 2274)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> function bp_core_screen_activation() {
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- if ( !bp_core_is_multiblog_install() || BP_ACTIVATION_SLUG != $bp->current_component )
</del><ins>+ if ( !bp_core_is_multisite() || BP_ACTIVATION_SLUG != $bp->current_component )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* Check if an activation key has been passed */
</span></span></pre></div>
<a id="trunkbpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-adminbar.php (2273 => 2274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-adminbar.php 2010-01-06 20:44:44 UTC (rev 2273)
+++ trunk/bp-core/bp-core-adminbar.php 2010-01-06 21:24:41 UTC (rev 2274)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> <li class="alt"><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug . '/?random-group' ?>"><?php _e( 'Random Group', 'buddypress' ) ?></a></li>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php if ( function_exists('bp_blogs_install') && bp_core_is_multiblog_install() ) : ?>
</del><ins>+ <?php if ( function_exists('bp_blogs_install') && bp_core_is_multisite() ) : ?>
</ins><span class="cx"> <li><a href="<?php echo $bp->root_domain . '/' . $bp->blogs->slug . '/?random-blog' ?>"><?php _e( 'Random Blog', 'buddypress' ) ?></a></li>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -263,12 +263,12 @@
</span><span class="cx"> add_action( 'bp_adminbar_menus', 'bp_adminbar_login_menu', 2 );
</span><span class="cx"> add_action( 'bp_adminbar_menus', 'bp_adminbar_account_menu', 4 );
</span><span class="cx">
</span><del>-if ( bp_core_is_multiblog_install() )
</del><ins>+if ( bp_core_is_multisite() )
</ins><span class="cx"> add_action( 'bp_adminbar_menus', 'bp_adminbar_blogs_menu', 6 );
</span><span class="cx">
</span><span class="cx"> add_action( 'bp_adminbar_menus', 'bp_adminbar_notifications_menu', 8 );
</span><span class="cx">
</span><del>-if ( bp_core_is_multiblog_install() )
</del><ins>+if ( bp_core_is_multisite() )
</ins><span class="cx"> add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu', 12 );
</span><span class="cx">
</span><span class="cx"> add_action( 'bp_adminbar_menus', 'bp_adminbar_random_menu', 100 );
</span></span></pre></div>
<a id="trunkbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-avatars.php (2273 => 2274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2010-01-06 20:44:44 UTC (rev 2273)
+++ trunk/bp-core/bp-core-avatars.php 2010-01-06 21:24:41 UTC (rev 2274)
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_core_avatar_upload_path() {
</span><del>- if ( bp_core_is_multiblog_install() )
</del><ins>+ if ( bp_core_is_multisite() )
</ins><span class="cx"> $path = ABSPATH . get_blog_option( BP_ROOT_BLOG, 'upload_path' );
</span><span class="cx"> else {
</span><span class="cx"> if ( !$path = get_option( 'upload_path' ) )
</span></span></pre></div>
<a id="trunkbpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-catchuri.php (2273 => 2274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2010-01-06 20:44:44 UTC (rev 2273)
+++ trunk/bp-core/bp-core-catchuri.php 2010-01-06 21:24:41 UTC (rev 2274)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> global $bp_unfiltered_uri;
</span><span class="cx"> global $bp, $current_blog;
</span><span class="cx">
</span><del>- if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && bp_core_is_multiblog_install() ) {
</del><ins>+ if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && bp_core_is_multisite() ) {
</ins><span class="cx"> /* Only catch URI's on the root blog if we are not running BP on multiple blogs */
</span><span class="cx"> if ( BP_ROOT_BLOG != (int) $current_blog->blog_id )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkbpcorebpcoresignupphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-signup.php (2273 => 2274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-signup.php 2010-01-06 20:44:44 UTC (rev 2273)
+++ trunk/bp-core/bp-core-signup.php 2010-01-06 21:24:41 UTC (rev 2274)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> $usermeta = apply_filters( 'bp_signup_usermeta', $usermeta );
</span><span class="cx">
</span><span class="cx"> /* Finally, sign up the user and/or blog*/
</span><del>- if ( isset( $_POST['signup_with_blog'] ) && bp_core_is_multiblog_install() )
</del><ins>+ if ( isset( $_POST['signup_with_blog'] ) && bp_core_is_multisite() )
</ins><span class="cx"> wpmu_signup_blog( $blog_details['domain'], $blog_details['path'], $blog_details['blog_title'], $_POST['signup_username'], $_POST['signup_email'], $usermeta );
</span><span class="cx"> else {
</span><span class="cx"> bp_core_signup_user( $_POST['signup_username'], $_POST['signup_password'], $_POST['signup_email'], $usermeta );
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx">
</span><span class="cx"> $bp->signup->step = 'completed-confirmation';
</span><span class="cx">
</span><del>- if ( bp_core_is_multiblog_install() ) {
</del><ins>+ if ( bp_core_is_multisite() ) {
</ins><span class="cx"> /* Get the activation key */
</span><span class="cx"> if ( !$bp->signup->key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $_POST[ 'signup_username' ], $_POST[ 'signup_email' ] ) ) ) {
</span><span class="cx"> bp_core_add_message( __( 'There was a problem uploading your avatar, please try uploading it again', 'buddypress' ) );
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> function bp_core_signup_user( $user_login, $user_password, $user_email, $usermeta ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( bp_core_is_multiblog_install() )
</del><ins>+ if ( bp_core_is_multisite() )
</ins><span class="cx"> return wpmu_signup_user( $user_login, $user_email, $usermeta );
</span><span class="cx">
</span><span class="cx"> $errors = new WP_Error();
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2273 => 2274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-01-06 20:44:44 UTC (rev 2273)
+++ trunk/bp-core/bp-core-templatetags.php 2010-01-06 21:24:41 UTC (rev 2274)
</span><span class="lines">@@ -1234,7 +1234,7 @@
</span><span class="cx"> echo bp_get_signup_allowed();
</span><span class="cx"> }
</span><span class="cx"> function bp_get_signup_allowed() {
</span><del>- if ( bp_core_is_multiblog_install() )
</del><ins>+ if ( bp_core_is_multisite() )
</ins><span class="cx"> return get_site_option( 'registration' );
</span><span class="cx"> else {
</span><span class="cx"> if ( (int)get_option( 'users_can_register') )
</span><span class="lines">@@ -1251,7 +1251,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_registration_needs_activation() {
</span><del>- return apply_filters( 'bp_registration_needs_activation', bp_core_is_multiblog_install() );
</del><ins>+ return apply_filters( 'bp_registration_needs_activation', bp_core_is_multisite() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcorewpabstractionphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-wpabstraction.php (2273 => 2274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-wpabstraction.php 2010-01-06 20:44:44 UTC (rev 2273)
+++ trunk/bp-core/bp-core-wpabstraction.php 2010-01-06 21:24:41 UTC (rev 2274)
</span><span class="lines">@@ -9,12 +9,15 @@
</span><span class="cx"> * the 3.0 WordPress version merge takes place.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-if ( !bp_core_is_multiblog_install() ) {
</del><ins>+if ( !bp_core_is_multisite() ) {
</ins><span class="cx"> $wpdb->base_prefix = $wpdb->prefix;
</span><span class="cx"> $wpdb->blogid = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_core_is_multiblog_install() {
</del><ins>+function bp_core_is_multisite() {
+ if ( function_exists( 'is_multisite' ) )
+ return is_multisite();
+
</ins><span class="cx"> if ( !function_exists( 'wpmu_signup_blog' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -22,7 +25,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_core_get_status_sql( $prefix = false ) {
</span><del>- if ( !bp_core_is_multiblog_install() )
</del><ins>+ if ( !bp_core_is_multisite() )
</ins><span class="cx"> return "{$prefix}user_status = 0";
</span><span class="cx"> else
</span><span class="cx"> return "{$prefix}spam = 0 AND {$prefix}deleted = 0 AND {$prefix}user_status = 0";
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (2273 => 2274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-01-06 20:44:44 UTC (rev 2273)
+++ trunk/bp-core.php 2010-01-06 21:24:41 UTC (rev 2274)
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> check_admin_referer( 'mark-unmark-spammer' );
</span><span class="cx">
</span><span class="cx"> /* Get the functions file */
</span><del>- if ( file_exists( ABSPATH . 'wp-admin/includes/mu.php' ) && bp_core_is_multiblog_install() )
</del><ins>+ if ( file_exists( ABSPATH . 'wp-admin/includes/mu.php' ) && bp_core_is_multisite() )
</ins><span class="cx"> require( ABSPATH . 'wp-admin/includes/mu.php' );
</span><span class="cx">
</span><span class="cx"> if ( 'mark-spammer' == $bp->current_action )
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Finally, mark this user as a spammer */
</span><del>- if ( bp_core_is_multiblog_install() )
</del><ins>+ if ( bp_core_is_multisite() )
</ins><span class="cx"> $wpdb->update( $wpdb->users, array( 'spam' => $is_spam ), array( 'ID' => $bp->displayed_user->id ) );
</span><span class="cx">
</span><span class="cx"> $wpdb->update( $wpdb->users, array( 'user_status' => $is_spam ), array( 'ID' => $bp->displayed_user->id ) );
</span><span class="lines">@@ -1192,7 +1192,7 @@
</span><span class="cx"> function bp_core_is_user_spammer( $user_id ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( bp_core_is_multiblog_install() )
</del><ins>+ if ( bp_core_is_multisite() )
</ins><span class="cx"> $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT spam FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) );
</span><span class="cx"> else
</span><span class="cx"> $is_spammer = (int) $wpdb->get_var( $wpdb->prepare( "SELECT user_status FROM " . CUSTOM_USER_TABLE . " WHERE ID = %d", $user_id ) );
</span><span class="lines">@@ -1476,7 +1476,7 @@
</span><span class="cx"> function bp_core_get_site_path() {
</span><span class="cx"> global $bp, $current_site;
</span><span class="cx">
</span><del>- if ( bp_core_is_multiblog_install() )
</del><ins>+ if ( bp_core_is_multisite() )
</ins><span class="cx"> $site_path = $current_site->path;
</span><span class="cx"> else {
</span><span class="cx"> $site_path = (array) explode( '/', site_url() );
</span></span></pre></div>
<a id="trunkbpforumsbpforumsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-admin.php (2273 => 2274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-admin.php 2010-01-06 20:44:44 UTC (rev 2273)
+++ trunk/bp-forums/bp-forums-admin.php 2010-01-06 21:24:41 UTC (rev 2274)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> $file .= "\n\n" . '$bb->uri = "' . BP_PLUGIN_URL . '/bp-forums/bbpress/";';
</span><span class="cx"> $file .= "\n" . '$bb->name = "' . get_blog_option( BP_ROOT_BLOG, 'name' ) . ' ' . __( 'Forums', 'buddypress' ) . '";';
</span><span class="cx">
</span><del>- if ( bp_core_is_multiblog_install() )
</del><ins>+ if ( bp_core_is_multisite() )
</ins><span class="cx"> $file .= "\n" . '$bb->wordpress_mu_primary_blog_id = ' . BP_ROOT_BLOG . ';';
</span><span class="cx">
</span><span class="cx"> if ( defined( 'AUTH_SALT' ) )
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfooterphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/footer.php (2273 => 2274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/footer.php 2010-01-06 20:44:44 UTC (rev 2273)
+++ trunk/bp-themes/bp-default/footer.php 2010-01-06 21:24:41 UTC (rev 2274)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <?php do_action( 'bp_before_footer' ) ?>
</span><span class="cx">
</span><span class="cx"> <div id="footer">
</span><del>- <?php if ( bp_core_is_multiblog_install() ) : ?>
</del><ins>+ <?php if ( bp_core_is_multisite() ) : ?>
</ins><span class="cx"> <p><?php printf( __( '%s is proudly powered by <a href="http://mu.wordpress.org">WordPress MU</a> and <a href="http://buddypress.org">BuddyPress</a>', 'buddypress' ), bloginfo('name') ); ?></p>
</span><span class="cx"> <?php else : ?>
</span><span class="cx"> <p><?php printf( __( '%s is proudly powered by <a href="http://wordpress.org">WordPress</a> and <a href="http://buddypress.org">BuddyPress</a>', 'buddypress' ), bloginfo('name') ); ?></p>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/header.php (2273 => 2274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/header.php 2010-01-06 20:44:44 UTC (rev 2273)
+++ trunk/bp-themes/bp-default/header.php 2010-01-06 21:24:41 UTC (rev 2274)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> </li>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php if ( function_exists( 'bp_blogs_install' ) && bp_core_is_multiblog_install() ) : ?>
</del><ins>+ <?php if ( function_exists( 'bp_blogs_install' ) && bp_core_is_multisite() ) : ?>
</ins><span class="cx"> <li<?php if ( bp_is_page( BP_BLOGS_SLUG ) ) : ?> class="selected"<?php endif; ?>>
</span><span class="cx"> <a href="<?php echo site_url() ?>/<?php echo BP_BLOGS_SLUG ?>/" title="<?php _e( 'Blogs', 'buddypress' ) ?>"><?php _e( 'Blogs', 'buddypress' ) ?></a>
</span><span class="cx"> </li>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultregistrationregisterphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/registration/register.php (2273 => 2274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/registration/register.php 2010-01-06 20:44:44 UTC (rev 2273)
+++ trunk/bp-themes/bp-default/registration/register.php 2010-01-06 21:24:41 UTC (rev 2274)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_signup_profile_fields' ) ?>
</span><span class="cx">
</span><del>- <?php if ( bp_core_is_multiblog_install() && 'all' == bp_get_signup_allowed() || 'blog' == bp_get_signup_allowed() ) : ?>
</del><ins>+ <?php if ( bp_core_is_multisite() && 'all' == bp_get_signup_allowed() || 'blog' == bp_get_signup_allowed() ) : ?>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_blog_details_fields' ) ?>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>