Changeset 10971 for trunk/src/bp-blogs/bp-blogs-activity.php

Timestamp:

07/30/2016 11:40:55 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.

Fixes #7199 (trunk)

File:

• trunk/src/bp-blogs/bp-blogs-activity.php (modified) (1 diff)

trunk/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 );
 
 /**