<!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] [3358] trunk: Deprecated bp_core_is_multisite()</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3358</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-11-05 21:44:38 +0000 (Fri, 05 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deprecated bp_core_is_multisite()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreadminphp">trunk/bp-core/admin/bp-core-admin.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreupgradephp">trunk/bp-core/admin/bp-core-upgrade.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="#trunkbpcorebpcorecssjsphp">trunk/bp-core/bp-core-cssjs.php</a></li>
<li><a href="#trunkbpcorebpcorefiltersphp">trunk/bp-core/bp-core-filters.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (3357 => 3358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2010-11-05 21:37:15 UTC (rev 3357)
+++ trunk/bp-blogs.php 2010-11-05 21:44:38 UTC (rev 3358)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-templatetags.php' );
</span><span class="cx">
</span><span class="cx"> /* Include the sitewide blog posts widget if this is a multisite installation */
</span><del>-if ( bp_core_is_multisite() )
</del><ins>+if ( is_multisite() )
</ins><span class="cx"> require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-widgets.php' );
</span><span class="cx">
</span><span class="cx"> function bp_blogs_setup_globals() {
</span><span class="lines">@@ -43,7 +43,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_multisite() )
</del><ins>+ if ( !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">@@ -71,7 +71,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_multisite() && $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
</del><ins>+ if ( 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">@@ -92,7 +92,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_multisite() )
</del><ins>+ if ( !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">@@ -102,7 +102,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_multisite() || $bp->current_component != $bp->blogs->slug || 'create' != $bp->current_action )
</del><ins>+ if ( !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">@@ -357,7 +357,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( 'publish' == $post->post_status && '' == $post->post_password ) {
</span><del>- if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
</del><ins>+ if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !is_multisite() ) {
</ins><span class="cx"> /* Record this in activity streams */
</span><span class="cx"> $post_permalink = get_permalink( $post_id );
</span><span class="cx">
</span><span class="lines">@@ -615,7 +615,7 @@
</span><span class="cx"> function bp_blogs_delete_blogmeta( $blog_id, $meta_key = false, $meta_value = false ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- if ( !is_numeric( $blog_id ) || !bp_core_is_multisite() )
</del><ins>+ if ( !is_numeric( $blog_id ) || !is_multisite() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
</span><span class="lines">@@ -643,7 +643,7 @@
</span><span class="cx">
</span><span class="cx"> $blog_id = (int) $blog_id;
</span><span class="cx">
</span><del>- if ( !$blog_id || !bp_core_is_multisite() )
</del><ins>+ if ( !$blog_id || !is_multisite() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( !empty($meta_key) ) {
</span><span class="lines">@@ -675,7 +675,7 @@
</span><span class="cx"> function bp_blogs_update_blogmeta( $blog_id, $meta_key, $meta_value ) {
</span><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><del>- if ( !is_numeric( $blog_id ) || !bp_core_is_multisite() )
</del><ins>+ if ( !is_numeric( $blog_id ) || !is_multisite() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
</span><span class="lines">@@ -705,7 +705,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_blogs_remove_data( $user_id ) {
</span><del>- if ( !bp_core_is_multisite() )
</del><ins>+ if ( !is_multisite() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* If this is regular blog, delete all data for that blog. */
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-admin.php (3357 => 3358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-admin.php 2010-11-05 21:37:15 UTC (rev 3357)
+++ trunk/bp-core/admin/bp-core-admin.php 2010-11-05 21:44:38 UTC (rev 3358)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif; ?>
</span><del>- <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') && bp_core_is_multisite() ) : ?>
</del><ins>+ <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') && is_multisite() ) : ?>
</ins><span class="cx"> <tr>
</span><span class="cx"> <td><h3><?php _e( 'Blog Tracking', 'buddypress' ) ?></h3><p><?php _e( 'Tracks blogs, blog posts and blogs comments for a user across a WPMU installation.', 'buddypress' ) ?></p></td>
</span><span class="cx"> <td>
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-upgrade.php (3357 => 3358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-upgrade.php 2010-11-05 21:37:15 UTC (rev 3357)
+++ trunk/bp-core/admin/bp-core-upgrade.php 2010-11-05 21:44:38 UTC (rev 3358)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx">
</span><del>- <?php if ( bp_core_is_multisite() ) : ?>
</del><ins>+ <?php if ( is_multisite() ) : ?>
</ins><span class="cx"> <div class="component">
</span><span class="cx"> <h5><?php _e( "Blog Tracking", 'buddypress' ) ?></h5>
</span><span class="cx">
</span><span class="lines">@@ -413,7 +413,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php if ( bp_core_is_multisite() && !isset( $disabled_components['bp-blogs.php'] ) ) : ?>
</del><ins>+ <?php if ( is_multisite() && !isset( $disabled_components['bp-blogs.php'] ) ) : ?>
</ins><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row">
</span><span class="cx"> <h5><?php _e( 'Blogs', 'buddypress' ) ?></h5>
</span><span class="lines">@@ -913,7 +913,7 @@
</span><span class="cx"> bp_core_install_extended_profiles();
</span><span class="cx">
</span><span class="cx"> /* Only install blog tables if this is a multisite installation */
</span><del>- if ( bp_core_is_multisite() && empty( $disabled['bp-blogs.php'] ) )
</del><ins>+ if ( is_multisite() && empty( $disabled['bp-blogs.php'] ) )
</ins><span class="cx"> bp_core_install_blog_tracking();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -938,12 +938,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // On first installation - record all existing blogs in the system.
</span><del>- if ( !(int)$bp->site_options['bp-blogs-first-install'] && bp_core_is_multisite() ) {
</del><ins>+ if ( !(int)$bp->site_options['bp-blogs-first-install'] && is_multisite() ) {
</ins><span class="cx"> bp_blogs_record_existing_blogs();
</span><span class="cx"> add_site_option( 'bp-blogs-first-install', 1 );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( bp_core_is_multisite() )
</del><ins>+ if ( is_multisite() )
</ins><span class="cx"> bp_core_add_illegal_names();
</span><span class="cx">
</span><span class="cx"> /* Upgrade and remove the message threads table if it exists */
</span></span></pre></div>
<a id="trunkbpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-adminbar.php (3357 => 3358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-adminbar.php 2010-11-05 21:37:15 UTC (rev 3357)
+++ trunk/bp-core/bp-core-adminbar.php 2010-11-05 21:44:38 UTC (rev 3358)
</span><span class="lines">@@ -227,7 +227,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 ( bp_is_active( 'blogs' ) && bp_core_is_multisite() ) : ?>
</del><ins>+ <?php if ( bp_is_active( 'blogs' ) && 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">@@ -242,12 +242,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_multisite() )
</del><ins>+if ( 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_multisite() )
</del><ins>+if ( 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 (3357 => 3358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2010-11-05 21:37:15 UTC (rev 3357)
+++ trunk/bp-core/bp-core-avatars.php 2010-11-05 21:44:38 UTC (rev 3358)
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx"> $upload_dir = wp_upload_dir();
</span><span class="cx">
</span><span class="cx"> // If multisite, and current blog does not match root blog, make adjustments
</span><del>- if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
</del><ins>+ if ( is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
</ins><span class="cx"> $upload_dir['basedir'] = get_blog_option( BP_ROOT_BLOG, 'upload_path' );
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_avatar_upload_path', $upload_dir['basedir'] );
</span><span class="lines">@@ -566,7 +566,7 @@
</span><span class="cx"> $upload_dir = wp_upload_dir();
</span><span class="cx">
</span><span class="cx"> // If multisite, and current blog does not match root blog, make adjustments
</span><del>- if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
</del><ins>+ if ( is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
</ins><span class="cx"> $upload_dir['baseurl'] = str_replace( get_home_url( $current_blog->blog_id ) , get_home_url( BP_ROOT_BLOG ), $upload_dir['baseurl'] );
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_avatar_url', $upload_dir['baseurl'] );
</span></span></pre></div>
<a id="trunkbpcorebpcorecatchuriphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-catchuri.php (3357 => 3358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-catchuri.php 2010-11-05 21:37:15 UTC (rev 3357)
+++ trunk/bp-core/bp-core-catchuri.php 2010-11-05 21:44:38 UTC (rev 3358)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> if ( empty( $bp_pages ) )
</span><span class="cx"> $bp_pages = bp_core_get_page_names();
</span><span class="cx">
</span><del>- if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && bp_core_is_multisite() ) {
</del><ins>+ if ( !defined( 'BP_ENABLE_MULTIBLOG' ) && 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="trunkbpcorebpcorecssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-cssjs.php (3357 => 3358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-cssjs.php 2010-11-05 21:37:15 UTC (rev 3357)
+++ trunk/bp-core/bp-core-cssjs.php 2010-11-05 21:44:38 UTC (rev 3358)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG ) || is_admin() ) {
</del><ins>+ if ( ( is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG ) || is_admin() ) {
</ins><span class="cx"> $stylesheet = get_blog_option( BP_ROOT_BLOG, 'stylesheet' );
</span><span class="cx">
</span><span class="cx"> if ( file_exists( WP_CONTENT_DIR . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ) )
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> function bp_core_confirmation_js() {
</span><span class="cx"> global $current_blog;
</span><span class="cx">
</span><del>- if ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
</del><ins>+ if ( is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
</ins><span class="cx"> return false;
</span><span class="cx"> ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcorefiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-filters.php (3357 => 3358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-filters.php 2010-11-05 21:37:15 UTC (rev 3357)
+++ trunk/bp-core/bp-core-filters.php 2010-11-05 21:44:38 UTC (rev 3358)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> function bp_core_login_redirect( $redirect_to ) {
</span><span class="cx"> global $bp, $current_blog;
</span><span class="cx">
</span><del>- if ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
</del><ins>+ if ( is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
</ins><span class="cx"> return $redirect_to;
</span><span class="cx">
</span><span class="cx"> if ( !empty( $_REQUEST['redirect_to'] ) || strpos( $_REQUEST['redirect_to'], 'wp-admin' ) )
</span></span></pre></div>
<a id="trunkbpcorebpcoresignupphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-signup.php (3357 => 3358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-signup.php 2010-11-05 21:37:15 UTC (rev 3357)
+++ trunk/bp-core/bp-core-signup.php 2010-11-05 21:44:38 UTC (rev 3358)
</span><span class="lines">@@ -138,7 +138,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_multisite() )
</del><ins>+ if ( isset( $_POST['signup_with_blog'] ) && is_multisite() )
</ins><span class="cx"> bp_core_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">@@ -162,7 +162,7 @@
</span><span class="cx">
</span><span class="cx"> $bp->signup->step = 'completed-confirmation';
</span><span class="cx">
</span><del>- if ( bp_core_is_multisite() ) {
</del><ins>+ if ( 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">@@ -224,7 +224,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Check for an uploaded avatar and move that to the correct user folder */
</span><del>- if ( bp_core_is_multisite() )
</del><ins>+ if ( is_multisite() )
</ins><span class="cx"> $hashed_key = wp_hash( $_GET['key'] );
</span><span class="cx"> else
</span><span class="cx"> $hashed_key = wp_hash( $user );
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_core_validate_blog_signup( $blog_url, $blog_title ) {
</span><del>- if ( !bp_core_is_multisite() || !function_exists( 'wpmu_validate_blog_signup' ) )
</del><ins>+ if ( !is_multisite() || !function_exists( 'wpmu_validate_blog_signup' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_validate_blog_signup', wpmu_validate_blog_signup( $blog_url, $blog_title ) );
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> /* Multisite installs have their own install procedure */
</span><del>- if ( bp_core_is_multisite() ) {
</del><ins>+ if ( is_multisite() ) {
</ins><span class="cx"> wpmu_signup_user( $user_login, $user_email, $usermeta );
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> * To disable sending activation emails you can user the filter 'bp_core_signup_send_activation_key' and return false.
</span><span class="cx"> */
</span><span class="cx"> if ( apply_filters( 'bp_core_signup_send_activation_key', true ) ) {
</span><del>- if ( !bp_core_is_multisite() ) {
</del><ins>+ if ( !is_multisite() ) {
</ins><span class="cx"> $activation_key = wp_hash( $user_id );
</span><span class="cx"> update_user_meta( $user_id, 'activation_key', $activation_key );
</span><span class="cx"> bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key );
</span><span class="lines">@@ -435,7 +435,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_core_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) {
</span><del>- if ( !bp_core_is_multisite() || !function_exists( 'wpmu_signup_blog' ) )
</del><ins>+ if ( !is_multisite() || !function_exists( 'wpmu_signup_blog' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_signup_blog', wpmu_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) );
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx"> $user = false;
</span><span class="cx">
</span><span class="cx"> /* Multisite installs have their own activation routine */
</span><del>- if ( bp_core_is_multisite() ) {
</del><ins>+ if ( is_multisite() ) {
</ins><span class="cx"> $user = wpmu_activate_signup( $key );
</span><span class="cx">
</span><span class="cx"> /* If there was errors, add a message and redirect */
</span><span class="lines">@@ -497,7 +497,7 @@
</span><span class="cx"> update_user_meta( $user_id, 'last_activity', bp_core_current_time() );
</span><span class="cx">
</span><span class="cx"> /* Set the password on multisite installs */
</span><del>- if ( bp_core_is_multisite() && !empty( $user['meta']['password'] ) )
</del><ins>+ if ( is_multisite() && !empty( $user['meta']['password'] ) )
</ins><span class="cx"> $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->users SET user_pass = %s WHERE ID = %d", $user['meta']['password'], $user_id ) );
</span><span class="cx">
</span><span class="cx"> /* Delete the total member cache */
</span><span class="lines">@@ -617,7 +617,7 @@
</span><span class="cx"> if ( locate_template( array( 'registration/register.php' ), false ) || locate_template( array( 'register.php' ), false ) )
</span><span class="cx"> bp_core_redirect( bp_get_root_domain() . '/' . BP_REGISTER_SLUG . '/' );
</span><span class="cx"> }
</span><del>-if ( bp_core_is_multisite() )
</del><ins>+if ( is_multisite() )
</ins><span class="cx"> add_action( 'wp', 'bp_core_wpsignup_redirect' );
</span><span class="cx"> else
</span><span class="cx"> add_action( 'init', 'bp_core_wpsignup_redirect' );
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (3357 => 3358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-11-05 21:37:15 UTC (rev 3357)
+++ trunk/bp-core/bp-core-templatetags.php 2010-11-05 21:44:38 UTC (rev 3358)
</span><span class="lines">@@ -978,7 +978,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global array $bp
</span><span class="cx"> * @uses function_exists
</span><del>- * @uses bp_core_is_multisite()
</del><ins>+ * @uses is_multisite()
</ins><span class="cx"> * @return bool Filterable result
</span><span class="cx"> */
</span><span class="cx"> function bp_search_form_enabled() {
</span><span class="lines">@@ -986,7 +986,7 @@
</span><span class="cx">
</span><span class="cx"> if ( function_exists( 'xprofile_install' )
</span><span class="cx"> || function_exists( 'groups_install' )
</span><del>- || ( function_exists( 'bp_blogs_install' ) && bp_core_is_multisite() )
</del><ins>+ || ( function_exists( 'bp_blogs_install' ) && is_multisite() )
</ins><span class="cx"> || ( function_exists( 'bp_forums_setup' ) && !(int)$bp->site_options['bp-disable-forum-directory'] )
</span><span class="cx"> ) {
</span><span class="cx"> $search_enabled = true;
</span><span class="lines">@@ -1024,7 +1024,7 @@
</span><span class="cx"> if ( function_exists( 'bp_forums_is_installed_correctly' ) && bp_forums_is_installed_correctly() && !(int) $bp->site_options['bp-disable-forum-directory'] )
</span><span class="cx"> $options['forums'] = __( 'Forums', 'buddypress' );
</span><span class="cx">
</span><del>- if ( bp_is_active( 'blogs' ) && bp_core_is_multisite() )
</del><ins>+ if ( bp_is_active( 'blogs' ) && is_multisite() )
</ins><span class="cx"> $options['blogs'] = __( 'Blogs', 'buddypress' );
</span><span class="cx">
</span><span class="cx"> // Eventually this won't be needed and a page will be built to integrate all search results.
</span><span class="lines">@@ -1242,7 +1242,7 @@
</span><span class="cx"> function bp_get_signup_allowed() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( bp_core_is_multisite() ) {
</del><ins>+ if ( is_multisite() ) {
</ins><span class="cx"> if ( in_array( $bp->site_options['registration'], array( 'all', 'user' ) ) )
</span><span class="cx"> return true;
</span><span class="cx"> } else {
</span><span class="lines">@@ -1258,7 +1258,7 @@
</span><span class="cx"> function bp_get_blog_signup_allowed() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !bp_core_is_multisite() )
</del><ins>+ if ( !is_multisite() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $status = $bp->site_options['registration'];
</span></span></pre></div>
<a id="trunkbpcorebpcorewpabstractionphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-wpabstraction.php (3357 => 3358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-wpabstraction.php 2010-11-05 21:37:15 UTC (rev 3357)
+++ trunk/bp-core/bp-core-wpabstraction.php 2010-11-05 21:44:38 UTC (rev 3358)
</span><span class="lines">@@ -9,12 +9,22 @@
</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_multisite() ) {
</del><ins>+if ( !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><ins>+/**
+ * bp_core_is_multisite()
+ *
+ * This function originally served as a wrapper when WordPress and WordPress MU were separate entities.
+ * Use is_multisite() instead.
+ *
+ * @deprecated 1.3
+ * @deprecated Use is_multisite()
+ */
</ins><span class="cx"> function bp_core_is_multisite() {
</span><ins>+ _deprecated_function( __FUNCTION__, '1.3', 'is_multisite()' );
</ins><span class="cx"> if ( function_exists( 'is_multisite' ) )
</span><span class="cx"> return is_multisite();
</span><span class="cx">
</span><span class="lines">@@ -38,7 +48,7 @@
</span><span class="cx"> function bp_core_is_main_site( $blog_id = '' ) {
</span><span class="cx"> global $current_site, $current_blog;
</span><span class="cx">
</span><del>- if ( !bp_core_is_multisite() )
</del><ins>+ if ( !is_multisite() )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if ( empty( $blog_id ) )
</span><span class="lines">@@ -48,7 +58,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_multisite() )
</del><ins>+ if ( !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 (3357 => 3358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-11-05 21:37:15 UTC (rev 3357)
+++ trunk/bp-core.php 2010-11-05 21:44:38 UTC (rev 3358)
</span><span class="lines">@@ -429,7 +429,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 ( bp_core_is_multisite() )
</del><ins>+ if ( is_multisite() )
</ins><span class="cx"> require_once( ABSPATH . 'wp-admin/includes/ms.php' );
</span><span class="cx">
</span><span class="cx"> if ( 'mark-spammer' == $bp->current_action )
</span><span class="lines">@@ -453,7 +453,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_multisite() )
</del><ins>+ if ( 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">@@ -1235,7 +1235,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_multisite() )
</del><ins>+ if ( 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">@@ -1528,7 +1528,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_multisite() )
</del><ins>+ if ( 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 class="lines">@@ -1586,7 +1586,7 @@
</span><span class="cx">
</span><span class="cx"> $meta_keys = "'" . implode( "','", (array)$options ) ."'";
</span><span class="cx">
</span><del>- if ( bp_core_is_multisite() )
</del><ins>+ if ( is_multisite() )
</ins><span class="cx"> $meta = $wpdb->get_results( "SELECT meta_key AS name, meta_value AS value FROM {$wpdb->sitemeta} WHERE meta_key IN ({$meta_keys}) AND site_id = {$wpdb->siteid}" );
</span><span class="cx"> else
</span><span class="cx"> $meta = $wpdb->get_results( "SELECT option_name AS name, option_value AS value FROM {$wpdb->options} WHERE option_name IN ({$meta_keys})" );
</span><span class="lines">@@ -1693,7 +1693,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* Specifically handle multi-site environment */
</span><del>- if ( bp_core_is_multisite() ) {
</del><ins>+ if ( is_multisite() ) {
</ins><span class="cx"> if ( $wp_version >= '3.0' )
</span><span class="cx"> require_once( ABSPATH . '/wp-admin/includes/ms.php' );
</span><span class="cx"> else
</span><span class="lines">@@ -1885,7 +1885,7 @@
</span><span class="cx">
</span><span class="cx"> $user = get_userdatabylogin( $username );
</span><span class="cx">
</span><del>- if ( ( bp_core_is_multisite() && (int)$user->spam ) || 1 == (int)$user->user_status )
</del><ins>+ if ( ( is_multisite() && (int)$user->spam ) || 1 == (int)$user->user_status )
</ins><span class="cx"> bp_core_redirect( $bp->root_domain );
</span><span class="cx"> else
</span><span class="cx"> return $auth_obj;
</span></span></pre></div>
<a id="trunkbpforumsbpforumsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-admin.php (3357 => 3358)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-admin.php 2010-11-05 21:37:15 UTC (rev 3357)
+++ trunk/bp-forums/bp-forums-admin.php 2010-11-05 21:44:38 UTC (rev 3358)
</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_multisite() )
</del><ins>+ if ( 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>
</div>
</body>
</html>