Changeset 10970

Timestamp:

07/30/2016 11:36:02 AM (8 years ago)

Author:

imath

Message:

Only delete the "new_blog" activity when its author is removed from the Blog.

Before this commit, as soon as any contributor was removed from the blog, the "new_blog" activity was also removed although the removed user was not the author of the activity.
It is no more the case. This activity will only be deleted if the user who created the blog is removed from it.
This commit also make sure this activity is not deleted twice as some duplicate code has been left when moving the activity code inside the bp-blogs-activity.php file during the 2.6 dev-cycle.

See #7199 (branch 2.6)

Location:

branches/2.6

Files:

• src/bp-blogs/bp-blogs-activity.php (modified) (1 diff)
• src/bp-blogs/bp-blogs-functions.php (modified) (1 diff)
• tests/phpunit/testcases/blogs/functions.php (modified) (1 diff)

branches/2.6/src/bp-blogs/bp-blogs-activity.php

@@ -640 +640 @@
  * @param int $blog_id Site ID.
  */
-function bp_blogs_delete_new_blog_activity_for_site( $blog_id ) {
-    bp_blogs_delete_activity( array(
+function bp_blogs_delete_new_blog_activity_for_site( $blog_id, $user_id = 0 ) {
+    $args = array(
         'item_id'   => $blog_id,
         'component' => buddypress()->blogs->id,
         'type'      => 'new_blog'
-    ) );
-}
-add_action( 'bp_blogs_remove_blog',          'bp_blogs_delete_new_blog_activity_for_site' );
-add_action( 'bp_blogs_remove_blog_for_user', 'bp_blogs_delete_new_blog_activity_for_site' );
+    );
+
+    /**
+     * In the case a user is removed, make sure he is the author of the 'new_blog' activity
+     * when trying to delete it.
+     */
+    if ( ! empty( $user_id ) ) {
+        $args['user_id'] = $user_id;
+    }
+
+    bp_blogs_delete_activity( $args );
+}
+add_action( 'bp_blogs_remove_blog',          'bp_blogs_delete_new_blog_activity_for_site', 10, 1 );
+add_action( 'bp_blogs_remove_blog_for_user', 'bp_blogs_delete_new_blog_activity_for_site', 10, 2 );
 
 /**

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

@@ -921 +921 @@
 
     /**
-     * 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'
-        ) );
-    }
-
-    /**
      * Fires after a blog has been removed from the tracker for a specific user.
      *

branches/2.6/tests/phpunit/testcases/blogs/functions.php

@@ -1017 +1017 @@
     }
 
+    /**
+     * @group bp_blogs_remove_blog
+     */
+    public function test_bp_blogs_remove_blog() {
+        if ( ! is_multisite() ) {
+            return;
+        }
+
+        $reset_post = $_POST;
+        $old_user = get_current_user_id();
+
+        // Simulate a new "BuddyPress generated" blog
+        $_POST['blog_public'] = 1;
+
+        $u = $this->factory->user->create();
+        $this->set_current_user( $u );
+
+        // Create three sites.
+        $b = $this->factory->blog->create( array(
+            'user_id' => $u
+        ) );
+
+        $activity = bp_activity_get( array(
+            'filter' => array(
+                'object'     => 'blogs',
+                'action'     => 'new_blog',
+                'primary_id' => $b,
+            ),
+        ) );
+
+        $new_blog = array_map( 'intval', wp_list_pluck( $activity['activities'], 'item_id', 'id' ) );
+        $this->assertSame( $b, reset( $new_blog ) );
+
+        // Removing the blog should delete the activity and the blog association.
+        wpmu_delete_blog( $b );
+
+        $deleted = bp_activity_get( array(
+            'in' => array_keys( $new_blog ),
+        ) );
+
+        $this->assertEmpty( $deleted['activities'] );
+        $this->assertEmpty( BP_Blogs_Blog::is_recorded( $b ) );
+
+        $_POST = $reset_post;
+        $this->set_current_user( $old_user );
+    }
+
+    /**
+     * @group bp_blogs_remove_blog_for_user
+     */
+    public function test_bp_blogs_remove_blog_for_user_is_contributor() {
+        if ( ! is_multisite() ) {
+            return;
+        }
+
+        $reset_post = $_POST;
+        $old_user = get_current_user_id();
+
+        // Simulate a new "BuddyPress generated" blog
+        $_POST['blog_public'] = 1;
+
+        $u = $this->factory->user->create();
+        $this->set_current_user( $u );
+
+        // Create three sites.
+        $b = $this->factory->blog->create( array(
+            'user_id' => $u
+        ) );
+
+        $u2 = $this->factory->user->create();
+        add_user_to_blog( $b, $u2, 'contributor' );
+
+        $u2_blogs = BP_Blogs_Blog::get_blog_ids_for_user( $u2 );
+        $this->assertContains( $b, $u2_blogs, 'The user should be associated to the blog as he is a contributor' );
+
+        remove_user_from_blog( $u2, $b );
+        $u2_blogs = BP_Blogs_Blog::get_blog_ids_for_user( $u2 );
+        $this->assertNotContains( $b, $u2_blogs, 'The user should not be associated anymore to the blog' );
+
+        $activity = bp_activity_get( array(
+            'filter' => array(
+                'object'     => 'blogs',
+                'action'     => 'new_blog',
+                'primary_id' => $b,
+            ),
+        ) );
+
+        $new_blog = array_map( 'intval', wp_list_pluck( $activity['activities'], 'item_id', 'id' ) );
+        $this->assertSame( $b, reset( $new_blog ), 'The new_blog activity should not be deleted when a contributor is removed from the blog.' );
+
+        $_POST = $reset_post;
+        $this->set_current_user( $old_user );
+    }
+
     protected function activity_exists_for_post( $post_id ) {
         $a = bp_activity_get( array(