Changeset 8315 for trunk/bp-core/bp-core-update.php

Timestamp:

04/24/2014 12:22:29 AM (12 years ago)

Author:

boonebgorges

Message:

Improve the migration tool that converts old non-multisite signups to post-2.0 system

This refactoring involves a number of improvements:

• Old signups are identified as those users with user_status=2, instead of those users with an 'activation_key' usermeta value. Use of the latter technique caused problems with upgrades when plugins had interfered in the normal BuddyPress registration flow in such a way as to retain the activation key on activated accounts. user_status=2 is a more reliable technique.
• Querying by user_status=2 means that the get_users() query does not have to include all usermeta, which makes for a more performant query on large sites.
• The migration routine has been broken out into a separate function bp_members_migrate_signups(), and unit tests have been written for it.
• Activation keys are now regenerated for migrated users who did not have an existing key in usermeta for some reason.

Fixes #5553

Props imath

File:

• trunk/bp-core/bp-core-update.php (modified) (1 diff)

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

@@ -366 +366 @@
                 bp_core_maybe_install_signups();
 
-                $signups = get_users( array(
-                        'fields'       => 'all_with_meta',
-                        'meta_key'     => 'activation_key',
-                        'meta_compare' => 'EXISTS',
-                ) );
-
-                if ( empty( $signups ) ) {
-                        return;
-                }
-
-                foreach ( $signups as $signup ) {
-                        $meta = array();
-
-                        if ( bp_is_active( 'xprofile' ) ) {
-                                $meta['field_1'] = $signup->display_name;
-                        }
-
-                        $meta['password'] = $signup->user_pass;
-
-                        $user_login = preg_replace( '/\s+/', '', sanitize_user( $signup->user_login, true ) );
-                        $user_email = sanitize_email( $signup->user_email );
-
-                        BP_Signup::add( array(
-                                'user_login'     => $user_login,
-                                'user_email'     => $user_email,
-                                'registered'     => $signup->user_registered,
-                                'activation_key' => $signup->activation_key,
-                                'meta'           => $meta
-                        ) );
-
-                        // Deleting these options will remove signups from users count
-                        delete_user_option( $signup->ID, 'capabilities' );
-                        delete_user_option( $signup->ID, 'user_level'   );
-                }
+                // Run the migration script
+                bp_members_migrate_signups();
         }