Changeset 9273

Timestamp:

12/24/2014 04:35:52 AM (12 years ago)

Author:

imath

Message:

Move the 'new_member' activity type into the Members component

Since BuddyPress 1.1, the 'new_member' type was attached to the xProfile component. In version 2.2, we are moving it into the Members one. Once the user will have upgraded to this version, every existing 'new_member' activity items will have their component updated to the 'members' one and each time a new member will register, the 'new_member' activity will be attached to the members component.

Props boonebgorges, DJPaul

Fixes #5807

Location:

trunk

Files:

• src/bp-activity/bp-activity-classes.php (modified) (1 diff)
• src/bp-core/bp-core-update.php (modified) (2 diffs)
• src/bp-core/deprecated/2.2.php (modified) (1 diff)
• src/bp-members/bp-members-activity.php (added)
• src/bp-members/bp-members-functions.php (modified) (1 diff)
• src/bp-members/bp-members-loader.php (modified) (1 diff)
• src/bp-xprofile/bp-xprofile-activity.php (modified) (2 diffs)
• tests/phpunit/testcases/members/activity.php (added)
• tests/phpunit/testcases/xprofile/activity.php (modified) (1 diff)

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

@@ -434 +434 @@
                 if ( empty( $r['filter']['object'] ) ) {
                         $excluded_types[] = 'last_activity';
-                }
-
-                // Exclude 'new_member' items if xprofile component is not active
-                if ( ! bp_is_active( 'xprofile' ) ) {
-                        $excluded_types[] = 'new_member';
                 }
 

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

@@ -399 +399 @@
  *
  * - Add messages meta table
+ * - Update the component field of the 'new members' activity type
  *
  * @since BuddyPress (2.2.0)
@@ -406 +407 @@
                 bp_core_install_private_messaging();
         }
+
+        if ( bp_is_active( 'activity' ) ) {
+                bp_migrate_new_member_activity_component();
+        }
+}
+
+/**
+ * Updates the component field for new_members type.
+ *
+ * @since BuddyPress (2.2.0)
+ *
+ * @global $wpdb
+ * @uses   buddypress()
+ *
+ */
+function bp_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' => 'xprofile',
+                        'type'      => 'new_member',
+                ),
+                // Data sanitization format
+                array(
+                        '%s',
+                ),
+                // WHERE sanitization format
+                array(
+                        '%s',
+                        '%s'
+                )
+        );
 }
 

trunk/src/bp-core/deprecated/2.2.php

@@ -78 +78 @@
         bp_blogs_clear_blog_object_cache( false, $recorded_blog_obj->user_id );
 }
+
+/**
+ * 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 );
+}

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

@@ -2126 +2126 @@
 
 /**
- * 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.
  *

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

@@ -59 +59 @@
                         'cache',
                 );
+
+                if ( bp_is_active( 'activity' ) ) {
+                        $includes[] = 'activity';
+                }
 
                 // Include these only if in admin

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

@@ -34 +34 @@
         );
 
-        // 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' ),
@@ -78 +66 @@
 
         return apply_filters( 'bp_xprofile_format_activity_action_new_avatar', $action, $activity );
-}
-
-/**
- * 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 );
 }
 

trunk/tests/phpunit/testcases/xprofile/activity.php

@@ -294 +294 @@
         /**
          * @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
          */