<!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][3853] trunk: bp_core_is_multisite is deprecated, so use is_multisite instead.</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>3853</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-01-24 02:00:05 +0000 (Mon, 24 Jan 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>bp_core_is_multisite is deprecated, so use is_multisite instead. See r3851, r3852, and #2574.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogsfunctionsphp">trunk/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunkbpcorebpcoreavatarsphp">trunk/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunkbpcorebpcorewpabstractionphp">trunk/bp-core/bp-core-wpabstraction.php</a></li>
<li><a href="#trunkbpcoredeprecated13php">trunk/bp-core/deprecated/1.3.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-functions.php (3852 => 3853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-functions.php 2011-01-23 21:45:14 UTC (rev 3852)
+++ trunk/bp-blogs/bp-blogs-functions.php 2011-01-24 02:00:05 UTC (rev 3853)
</span><span class="lines">@@ -146,15 +146,14 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( 'publish' == $post->post_status && empty( $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><del>- if ( is_multisite() ) {
</del><ins>+ if ( is_multisite() )
</ins><span class="cx"> $activity_action = sprintf( __( '%1$s wrote a new blog post: %2$s on the blog %3$s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>', '<a href="' . get_blog_option( $blog_id, 'home' ) . '">' . get_blog_option( $blog_id, 'blogname' ) . '</a>' );
</span><del>- } else {
</del><ins>+ else
</ins><span class="cx"> $activity_action = sprintf( __( '%1$s wrote a new blog post: %2$s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
</span><del>- }
</del><span class="cx">
</span><span class="cx"> $activity_content = $post->post_content;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-avatars.php (3852 => 3853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2011-01-23 21:45:14 UTC (rev 3852)
+++ trunk/bp-core/bp-core-avatars.php 2011-01-24 02:00:05 UTC (rev 3853)
</span><span class="lines">@@ -596,7 +596,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'] = trailingslashit( get_blog_option( BP_ROOT_BLOG, 'home' ) ) . get_blog_option( BP_ROOT_BLOG, 'upload_path' );
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_avatar_url', $upload_dir['baseurl'] );
</span></span></pre></div>
<a id="trunkbpcorebpcorewpabstractionphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-wpabstraction.php (3852 => 3853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-wpabstraction.php 2011-01-23 21:45:14 UTC (rev 3852)
+++ trunk/bp-core/bp-core-wpabstraction.php 2011-01-24 02:00:05 UTC (rev 3853)
</span><span class="lines">@@ -9,97 +9,87 @@
</span><span class="cx"> * the 3.0 WordPress version merge takes place.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/**
+ * Only add abstraction functions if WordPress is not in multisite mode
+ */
</ins><span class="cx"> if ( !is_multisite() ) {
</span><span class="cx"> $wpdb->base_prefix = $wpdb->prefix;
</span><del>- $wpdb->blogid = 1;
-}
</del><ins>+ $wpdb->blogid = 1;
</ins><span class="cx">
</span><del>-/**
- * 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()
- */
-function bp_core_is_multisite() {
- _deprecated_function( __FUNCTION__, '1.3', 'is_multisite()' );
- return is_multisite();
-}
</del><ins>+ /**
+ * bp_core_is_main_site
+ *
+ * Checks if current blog is root blog of site. Deprecated in 1.3.
+ *
+ * @deprecated 1.3
+ * @deprecated Use is_multisite()
+ * @package BuddyPress
+ * @param int $blog_id optional blog id to test (default current blog)
+ * @return bool True if not multisite or $blog_id is main site
+ * @since 1.2.6
+ */
+ function bp_core_is_main_site( $blog_id = '' ) {
+ _deprecated_function( __FUNCTION__, '1.3', 'is_main_site()' );
+ return is_main_site( $blog_id );
+ }
</ins><span class="cx">
</span><del>-/**
- * bp_core_is_main_site
- *
- * Checks if current blog is root blog of site. Deprecated in 1.3.
- *
- * @deprecated 1.3
- * @deprecated Use is_multisite()
- * @package BuddyPress
- * @param int $blog_id optional blog id to test (default current blog)
- * @return bool True if not multisite or $blog_id is main site
- * @since 1.2.6
- */
-function bp_core_is_main_site( $blog_id = '' ) {
- _deprecated_function( __FUNCTION__, '1.3', 'is_main_site()' );
- return is_main_site( $blog_id );
-}
-
-function bp_core_get_status_sql( $prefix = false ) {
- if ( !is_multisite() )
- return "{$prefix}user_status = 0";
- else
- return "{$prefix}spam = 0 AND {$prefix}deleted = 0 AND {$prefix}user_status = 0";
-}
-
-if ( !function_exists( 'get_blog_option' ) ) {
- function get_blog_option( $blog_id, $option_name, $default = false ) {
- return get_option( $option_name, $default );
</del><ins>+ function bp_core_get_status_sql( $prefix = false ) {
+ if ( !is_multisite() )
+ return "{$prefix}user_status = 0";
+ else
+ return "{$prefix}spam = 0 AND {$prefix}deleted = 0 AND {$prefix}user_status = 0";
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-if ( !function_exists( 'add_blog_option' ) ) {
- function add_blog_option( $blog_id, $option_name, $option_value ) {
- return add_option( $option_name, $option_value );
</del><ins>+ if ( !function_exists( 'get_blog_option' ) ) {
+ function get_blog_option( $blog_id, $option_name, $default = false ) {
+ return get_option( $option_name, $default );
+ }
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-if ( !function_exists( 'update_blog_option' ) ) {
- function update_blog_option( $blog_id, $option_name, $option_value ) {
- return update_option( $option_name, $option_value );
</del><ins>+ if ( !function_exists( 'add_blog_option' ) ) {
+ function add_blog_option( $blog_id, $option_name, $option_value ) {
+ return add_option( $option_name, $option_value );
+ }
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-if ( !function_exists( 'switch_to_blog' ) ) {
- function switch_to_blog() {
- return 1;
</del><ins>+ if ( !function_exists( 'update_blog_option' ) ) {
+ function update_blog_option( $blog_id, $option_name, $option_value ) {
+ return update_option( $option_name, $option_value );
+ }
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-if ( !function_exists( 'restore_current_blog' ) ) {
- function restore_current_blog() {
- return 1;
</del><ins>+ if ( !function_exists( 'switch_to_blog' ) ) {
+ function switch_to_blog() {
+ return 1;
+ }
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-if ( !function_exists( 'get_blogs_of_user' ) ) {
- function get_blogs_of_user() {
- return false;
</del><ins>+ if ( !function_exists( 'restore_current_blog' ) ) {
+ function restore_current_blog() {
+ return 1;
+ }
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-if ( !function_exists( 'update_blog_status' ) ) {
- function update_blog_status() {
- return true;
</del><ins>+ if ( !function_exists( 'get_blogs_of_user' ) ) {
+ function get_blogs_of_user() {
+ return false;
+ }
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-if ( !function_exists( 'is_subdomain_install' ) ) {
- function is_subdomain_install() {
- if ( ( defined( 'VHOST' ) && 'yes' == VHOST ) || ( defined( 'SUBDOMAIN_INSTALL' ) && SUBDOMAIN_INSTALL ) )
</del><ins>+ if ( !function_exists( 'update_blog_status' ) ) {
+ function update_blog_status() {
</ins><span class="cx"> return true;
</span><ins>+ }
+ }
</ins><span class="cx">
</span><del>- return false;
</del><ins>+ if ( !function_exists( 'is_subdomain_install' ) ) {
+ function is_subdomain_install() {
+ if ( ( defined( 'VHOST' ) && 'yes' == VHOST ) || ( defined( 'SUBDOMAIN_INSTALL' ) && SUBDOMAIN_INSTALL ) )
+ return true;
+
+ return false;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpcoredeprecated13php"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/deprecated/1.3.php (3852 => 3853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/deprecated/1.3.php 2011-01-23 21:45:14 UTC (rev 3852)
+++ trunk/bp-core/deprecated/1.3.php 2011-01-24 02:00:05 UTC (rev 3853)
</span><span class="lines">@@ -8,6 +8,22 @@
</span><span class="cx"> * @deprecated Since 1.3
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/** WP Abstraction ************************************************************/
+
+/**
+ * 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()
+ */
+function bp_core_is_multisite() {
+ _deprecated_function( __FUNCTION__, '1.3', 'is_multisite()' );
+ return is_multisite();
+}
+
</ins><span class="cx"> /** Activity ******************************************************************/
</span><span class="cx">
</span><span class="cx"> function bp_is_activity_permalink() {
</span></span></pre>
</div>
</div>
</body>
</html>