Ticket #5807: 5807.02.patch

src/bp-activity/bp-activity-classes.php

@@ -418 +418 @@
                         $excluded_types[] = 'last_activity';
                 }
 
-                // Exclude 'new_member' items if xprofile component is not active
-                if ( ! bp_is_active( 'xprofile' ) ) {
-                        $excluded_types[] = 'new_member';
-                }
-
                 // Build the excluded type sql part
                 if ( ! empty( $excluded_types ) ) {
                         $not_in = "'" . implode( "', '", esc_sql( $excluded_types ) ) . "'";

src/bp-core/bp-core-update.php

@@ -398 +398 @@
  * 2.2.0 update routine.
  *
  * - Add messages meta table
+ * - Update the component field of the 'new members' activity type
  *
  * @since BuddyPress (2.2.0)
  */
@@ -405 +406 @@
         if ( bp_is_active( 'messages' ) ) {
                 bp_core_install_private_messaging();
         }
+
+        if ( bp_is_active( 'activity' ) ) {
+                bp_members_migrate_new_member_activity_component();
+        }
 }
 
 /**

src/bp-core/deprecated/2.2.php

@@ -63 +63 @@
         _deprecated_function( __FUNCTION__, '2.2', 'bp_activity_post_type_update()' );
         bp_activity_post_type_update( $post );
 }
+
+/**
+ * Format 'new_member' activity actions.
+ *
+ * @since BuddyPress (2.0.0)
+ * @deprecated BuddyPress (2.2.0)
+ *
+ * @param string $action Static activity action.
+ * @param object $activity Activity object.
+ * @return string
+ */
+function bp_xprofile_format_activity_action_new_member( $action, $activity ) {
+        _deprecated_function( __FUNCTION__, '2.2', 'bp_members_format_activity_action_new_member()' );
+
+        $action = apply_filters( 'bp_xprofile_format_activity_action_new_member', $action, $activity );
+        return bp_members_format_activity_action_new_member( $action, $activity );
+}

src/bp-members/bp-members-activity.php

@@ +1 @@
+<?php
+
+/**
+ * BuddyPress Member Activity
+ *
+ * @package BuddyPress
+ * @subpackage MembersActivity
+ */
+
+// Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) exit;
+
+/**
+ * Register the 'new member' activity type
+ *
+ * @since  BuddyPress (2.2.0)
+ *
+ * @uses bp_activity_set_action()
+ * @uses buddypress()
+ */
+function bp_members_register_activity_actions() {
+
+        bp_activity_set_action(
+                buddypress()->members->id,
+                'new_member',
+                __( 'New member registered', 'buddypress' ),
+                'bp_members_format_activity_action_new_member',
+                __( 'New Members', 'buddypress' ),
+                array( 'activity' )
+        );
+
+        do_action( 'bp_members_register_activity_actions' );
+}
+add_action( 'bp_register_activity_actions', 'bp_members_register_activity_actions' );
+
+/**
+ * Format 'new_member' activity actions.
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @param string $action Static activity action.
+ * @param object $activity Activity object.
+ * @return string
+ */
+function bp_members_format_activity_action_new_member( $action, $activity ) {
+        $userlink = bp_core_get_userlink( $activity->user_id );
+        $action   = sprintf( __( '%s became a registered member', 'buddypress' ), $userlink );
+
+        // Legacy filter - pass $user_id instead of $activity
+        if ( has_filter( 'bp_core_activity_registered_member_action' ) ) {
+                $action = apply_filters( 'bp_core_activity_registered_member_action', $action, $activity->user_id );
+        }
+
+        return apply_filters( 'bp_members_format_activity_action_new_member', $action, $activity );
+}
+
+/**
+ * Create a "became a registered user" activity item when a user activates his account.
+ *
+ * @param array $user Array of userdata passed to bp_core_activated_user hook.
+ */
+function bp_core_new_user_activity( $user ) {
+        if ( empty( $user ) ) {
+                return false;
+        }
+
+        if ( is_array( $user ) ) {
+                $user_id = $user['user_id'];
+        } else {
+                $user_id = $user;
+        }
+
+        if ( empty( $user_id ) ) {
+                return false;
+        }
+
+        bp_activity_add( array(
+                'user_id'   => $user_id,
+                'component' => buddypress()->members->id,
+                'type'      => 'new_member'
+        ) );
+}
+add_action( 'bp_core_activated_user', 'bp_core_new_user_activity' );
+
+/**
+ * Updates the component field for new_members type.
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @global $wpdb
+ * @uses   buddypress()
+ *
+ */
+function bp_members_migrate_new_member_activity_component() {
+        global $wpdb;
+        $bp = buddypress();
+
+        // Update the component for the new_member type
+        $wpdb->update(
+                // Activity table
+                $bp->members->table_name_last_activity,
+                array(
+                        'component' => $bp->members->id,
+                ),
+                array(
+                        'component' => $bp->profile->id,
+                        'type'      => 'new_member',
+                ),
+                // Data sanitization format
+                array(
+                        '%s',
+                ),
+                // WHERE sanitization format
+                array(
+                        '%s',
+                        '%s'
+                )
+        );
+}

src/bp-members/bp-members-functions.php

@@ -1845 +1845 @@
 }
 
 /**
- * Create a "became a registered user" activity item when a user activates his account.
- *
- * @param array $user Array of userdata passed to bp_core_activated_user hook.
- */
-function bp_core_new_user_activity( $user ) {
-        if ( empty( $user ) || ! bp_is_active( 'activity' ) || ! bp_is_active( 'xprofile' ) ) {
-                return false;
-        }
-
-        if ( is_array( $user ) ) {
-                $user_id = $user['user_id'];
-        } else {
-                $user_id = $user;
-        }
-
-        if ( empty( $user_id ) ) {
-                return false;
-        }
-
-        bp_activity_add( array(
-                'user_id'   => $user_id,
-                'component' => 'xprofile',
-                'type'      => 'new_member'
-        ) );
-}
-add_action( 'bp_core_activated_user', 'bp_core_new_user_activity' );
-
-/**
  * Map a user's WP display name to the XProfile fullname field, if necessary.
  *
  * This only happens when a user is registered in wp-admin by an administrator;

src/bp-members/bp-members-loader.php

@@ -48 +48 @@
                         'functions'
                 );
 
+                if ( bp_is_active( 'activity' ) ) {
+                        $includes[] = 'activity';
+                }
+
                 // Include these only if in admin
                 if ( is_admin() ) {
                         $includes[] = 'admin';

src/bp-xprofile/bp-xprofile-activity.php

@@ -33 +33 @@
                 __( 'Updated Profile Photos', 'buddypress' )
         );
 
-        // Get the profile component ID
-        $profile_id = buddypress()->profile->id;
-
-        bp_activity_set_action(
-                $profile_id,
-                'new_member',
-                __( 'New member registered', 'buddypress' ),
-                'bp_xprofile_format_activity_action_new_member',
-                __( 'New Members', 'buddypress' ),
-                array( 'activity' )
-        );
-
         bp_activity_set_action(
-                $profile_id,
+                buddypress()->profile->id,
                 'updated_profile',
                 __( 'Updated Profile', 'buddypress' ),
                 'bp_xprofile_format_activity_action_updated_profile',
@@ -80 +68 @@
 }
 
 /**
- * Format 'new_member' activity actions.
- *
- * @since BuddyPress (2.0.0)
- *
- * @param string $action Static activity action.
- * @param object $activity Activity object.
- * @return string
- */
-function bp_xprofile_format_activity_action_new_member( $action, $activity ) {
-        $userlink = bp_core_get_userlink( $activity->user_id );
-        $action   = sprintf( __( '%s became a registered member', 'buddypress' ), $userlink );
-
-        // Legacy filter - pass $user_id instead of $activity
-        if ( has_filter( 'bp_core_activity_registered_member_action' ) ) {
-                $action = apply_filters( 'bp_core_activity_registered_member_action', $action, $activity->user_id );
-        }
-
-        return apply_filters( 'bp_xprofile_format_activity_action_new_member', $action, $activity );
-}
-
-/**
  * Format 'updated_profile' activity actions.
  *
  * @since BuddyPress (2.0.0)

tests/phpunit/testcases/members/activity.php

@@ +1 @@
+<?php
+
+/**
+ * @group members
+ * @group activity
+ */
+class BP_Tests_Members_Activity extends BP_UnitTestCase {
+
+        /**
+         * @group activity_action
+         * @group bp_core_format_activity_action_new_member
+         */
+        public function test_bp_members_format_activity_action_new_member() {
+                $u = $this->factory->user->create();
+                $a = $this->factory->activity->create( array(
+                        'component' => buddypress()->members->id,
+                        'type' => 'new_member',
+                        'user_id' => $u,
+                ) );
+
+                $expected = sprintf( __( '%s became a registered member', 'buddypress' ), bp_core_get_userlink( $u ) );
+
+                $a_obj = new BP_Activity_Activity( $a );
+
+                $this->assertSame( $expected, $a_obj->action );
+        }
+
+        /**
+         * @group bp_core_migrate_new_member_activity_component
+         */
+        public function test_bp_members_migrate_new_member_activity_component() {
+                global $wpdb;
+                $bp = buddypress();
+
+                $u1 = $this->factory->user->create();
+                $u2 = $this->factory->user->create();
+                $u3 = $this->factory->user->create();
+
+                $au1 = $this->factory->activity->create( array(
+                        'component' => 'xprofile',
+                        'type' => 'new_member',
+                        'user_id' => $u1,
+                ) );
+
+                $au2 = $this->factory->activity->create( array(
+                        'component' => 'xprofile',
+                        'type' => 'new_member',
+                        'user_id' => $u2,
+                ) );
+
+                $au3 = $this->factory->activity->create( array(
+                        'component' => 'xprofile',
+                        'type' => 'new_member',
+                        'user_id' => $u3,
+                ) );
+
+                bp_members_migrate_new_member_activity_component();
+
+                $expected = array(
+                        $u1 => $au1,
+                        $u2 => $au2,
+                        $u3 => $au3,
+                );
+
+                $in = "'" . implode( "', '", array_keys( $expected ) ) . "'";
+                $found = $wpdb->get_results(
+                        $wpdb->prepare(
+                                "SELECT user_id, id FROM {$bp->members->table_name_last_activity} WHERE component = %s AND type = %s AND user_id IN ({$in}) ORDER BY user_id ASC",
+                                $bp->members->id,
+                                'new_member'
+                ), OBJECT_K );
+
+                $found = array_map( 'intval', wp_list_pluck( $found, 'id' ) );
+
+                $this->assertSame( $expected, $found );
+        }
+}

tests/phpunit/testcases/xprofile/activity.php

@@ -293 +293 @@
 
         /**
          * @group activity_action
-         * @group bp_xprofile_format_activity_action_new_member
-         */
-        public function test_bp_xprofile_format_activity_action_new_member_xprofile_on() {
-                $active = bp_is_active( 'xprofile' );
-                buddypress()->active_components['xprofile'] = '1';
-
-                $u = $this->factory->user->create();
-                $a = $this->factory->activity->create( array(
-                        'component' => buddypress()->profile->id,
-                        'type' => 'new_member',
-                        'user_id' => $u,
-                ) );
-
-                $expected = sprintf( __( '%s became a registered member', 'buddypress' ), bp_core_get_userlink( $u ) );
-
-                $a_obj = new BP_Activity_Activity( $a );
-
-                $this->assertSame( $expected, $a_obj->action );
-
-                if ( ! $active ) {
-                        unset( buddypress()->active_components['xprofile'] );
-                }
-        }
-
-        /**
-         * @group activity_action
-         * @group bp_xprofile_format_activity_action_new_member
-         */
-        public function test_bp_xprofile_format_activity_action_new_member_xprofile_off() {
-                $active = bp_is_active( 'xprofile' );
-                unset( buddypress()->active_components['xprofile'] );
-
-                $u = $this->factory->user->create();
-                $a = $this->factory->activity->create( array(
-                        'component' => buddypress()->profile->id,
-                        'type' => 'new_member',
-                        'user_id' => $u,
-                ) );
-
-                $expected = sprintf( __( '%s became a registered member', 'buddypress' ), bp_core_get_userlink( $u ) );
-
-                $a_obj = new BP_Activity_Activity( $a );
-
-                $this->assertSame( $expected, $a_obj->action );
-
-                if ( $active ) {
-                        buddypress()->active_components['xprofile'] = '1';
-                }
-        }
-
-        /**
-         * @group activity_action
          * @group bp_xprofile_format_activity_action_updated_profile
          */
         public function test_bp_xprofile_format_activity_action_updated_profile() {