Changeset 2274 for trunk/bp-blogs.php

Timestamp:

01/06/2010 09:24:41 PM (16 years ago)

Author:

apeatling

Message:

Change multiblog naming convention to multisite to avoid future confusion.

File:

• trunk/bp-blogs.php (modified) (11 diffs)

trunk/bp-blogs.php

@@ -75 +75 @@
     global $wpdb, $bp, $userdata;
 
-    if ( is_site_admin() && bp_core_is_multiblog_install() ) {
+    if ( is_site_admin() && bp_core_is_multisite() ) {
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
         if ( get_site_option('bp-blogs-db-version') < BP_BLOGS_DB_VERSION )
@@ -124 +124 @@
     /* Blog/post/comment menus should not appear on single WordPress setups. Although comments
        and posts made by users will still show on their activity stream .*/
-    if ( !bp_core_is_multiblog_install() )
+    if ( !bp_core_is_multisite() )
         return false;
 
@@ -158 +158 @@
     global $bp;
 
-    if ( bp_core_is_multiblog_install() && $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
+    if ( bp_core_is_multisite() && $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
         $bp->is_directory = true;
 
@@ -179 +179 @@
     global $bp;
 
-    if ( !bp_core_is_multiblog_install() )
+    if ( !bp_core_is_multisite() )
         return false;
 
@@ -199 +199 @@
     global $bp;
 
-    if ( !bp_core_is_multiblog_install() || $bp->current_component != $bp->blogs->slug || 'create' != $bp->current_action )
+    if ( !bp_core_is_multisite() || $bp->current_component != $bp->blogs->slug || 'create' != $bp->current_action )
         return false;
 
@@ -362 +362 @@
 
             /* If we're on a multiblog install, record this post */
-            if ( bp_core_is_multiblog_install() ) {
+            if ( bp_core_is_multisite() ) {
                 $recorded_post = new BP_Blogs_Post;
                 $recorded_post->user_id = $user_id;
@@ -374 +374 @@
             }
 
-            if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
+            if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
                 /* Record this in activity streams */
                 $post_permalink = bp_post_get_permalink( $post, $blog_id );
@@ -411 +411 @@
         }
 
-        if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
+        if ( (int)get_blog_option( $blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
             /* Now re-record the post in the activity streams */
             $post_permalink = bp_post_get_permalink( $post, $blog_id );
@@ -455 +455 @@
 
     /* If we're on a multiblog install, record this post */
-    if ( bp_core_is_multiblog_install() ) {
+    if ( bp_core_is_multisite() ) {
         $recorded_comment = new BP_Blogs_Comment;
         $recorded_comment->user_id = $user_id;
@@ -468 +468 @@
     }
 
-    if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
+    if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
         /* Record in activity streams */
         $comment_link = bp_post_get_permalink( $comment->post, $wpdb->blogid ) . '#comment-' . $comment_id;
@@ -502 +502 @@
     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' ) );
 
-    if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multiblog_install() ) {
+    if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) || !bp_core_is_multisite() ) {
         /* Record in activity streams */
         $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );