Changeset 10631

Timestamp:

03/04/2016 06:37:59 PM (9 years ago)

Author:

imath

Message:

Make sure the Activity Component is active before using functions relative to it inside the Blogs component.

r10544 introduced a side effect on the BuddyPress Emails feature when the Blogs component is activated and the Activity one is deactivated.

This changeset removed some bp_is_active() checks inside bp_blogs_delete_activity() and bp_blogs_record_activity() in favor a conditional load of the whole bp-blogs/bp-blogs-activity.php file.

Unfortunately, an issue appeared when the Activity component is not active because these functions are used when some WordPress hooks are fired, for instance when a post type is deleted.

For the 2.5 Branch we are bringing back the bp_is_active() checks before using the two functions mentioned earlier. For next release, we will carry on moving all the code specific to the activity component inside the bp-blogs/bp-blogs-activity.php file.

See #6937 (branch 2.5)

File:

• branches/2.5/src/bp-blogs/bp-blogs-functions.php (modified) (5 diffs)

branches/2.5/src/bp-blogs/bp-blogs-functions.php

@@ -280 +280 @@
     $is_private = !apply_filters( 'bp_is_new_blog_public', !$is_private );
 
-    // Only record this activity if the blog is public.
-    if ( !$is_private && !$no_activity && bp_blogs_is_blog_trackable( $blog_id, $user_id ) ) {
+    // Only record this activity if the activity component is active and the blog is public.
+    if ( bp_is_active( 'activity' ) && !$is_private && !$no_activity && bp_blogs_is_blog_trackable( $blog_id, $user_id ) ) {
 
         // Record this in activity streams.
@@ -816 +816 @@
     BP_Blogs_Blog::delete_blog_for_all( $blog_id );
 
-    // Delete activity stream item.
-    bp_blogs_delete_activity( array(
-        'item_id'   => $blog_id,
-        'component' => buddypress()->blogs->id,
-        'type'      => 'new_blog'
-    ) );
+    /**
+     * Delete activity stream item only if the Activity component is active
+     *
+     * @see https://buddypress.trac.wordpress.org/ticket/6937
+     */
+    if ( bp_is_active( 'activity' ) ) {
+        bp_blogs_delete_activity( array(
+            'item_id'   => $blog_id,
+            'component' => buddypress()->blogs->id,
+            'type'      => 'new_blog'
+        ) );
+    }
 
     /**
@@ -858 +864 @@
     BP_Blogs_Blog::delete_blog_for_user( $blog_id, $user_id );
 
-    // Delete activity stream item.
-    bp_blogs_delete_activity( array(
-        'item_id'   => $blog_id,
-        'component' => buddypress()->blogs->id,
-        'type'      => 'new_blog'
-    ) );
+    /**
+     * Delete activity stream item only if the Activity component is active
+     *
+     * @see https://buddypress.trac.wordpress.org/ticket/6937
+     */
+    if ( bp_is_active( 'activity' ) ) {
+        bp_blogs_delete_activity( array(
+            'item_id'   => $blog_id,
+            'component' => buddypress()->blogs->id,
+            'type'      => 'new_blog'
+        ) );
+    }
 
     /**
@@ -911 +923 @@
     do_action( 'bp_blogs_before_remove_post', $blog_id, $post_id, $user_id );
 
-    // Delete activity stream item.
-    bp_blogs_delete_activity( array(
-        'item_id'           => $blog_id,
-        'secondary_item_id' => $post_id,
-        'component'         => buddypress()->blogs->id,
-        'type'              => 'new_blog_post'
-    ) );
+    /**
+     * Delete activity stream item only if the Activity component is active
+     *
+     * @see https://buddypress.trac.wordpress.org/ticket/6937
+     */
+    if ( bp_is_active( 'activity' ) ) {
+        bp_blogs_delete_activity( array(
+            'item_id'           => $blog_id,
+            'secondary_item_id' => $post_id,
+            'component'         => buddypress()->blogs->id,
+            'type'              => 'new_blog_post'
+        ) );
+    }
 
     /**
@@ -1109 +1127 @@
     BP_Blogs_Blog::delete_blog_for_all( $blog_id );
 
-    // Delete activity stream item.
-    bp_blogs_delete_activity( array(
-        'item_id'   => $blog_id,
-        'component' => buddypress()->blogs->id,
-        'type'      => false
-    ) );
+    /**
+     * Delete activity stream item only if the Activity component is active
+     *
+     * @see https://buddypress.trac.wordpress.org/ticket/6937
+     */
+    if ( bp_is_active( 'activity' ) ) {
+        bp_blogs_delete_activity( array(
+            'item_id'   => $blog_id,
+            'component' => buddypress()->blogs->id,
+            'type'      => false
+        ) );
+    }
 
     /**