Ticket #5553: 5553.05.diff

bp-core/bp-core-update.php

@@ -358 +358 @@
                         bp_core_install_signups();
                 }
 
-                $signups = get_users( array(
-                        'fields'       => 'all_with_meta',
-                        'meta_key'     => 'activation_key',
-                        'meta_compare' => 'EXISTS',
-                ) );
+                $status_2_ids = $wpdb->get_col( "SELECT ID FROM {$wpdb->users} WHERE user_status = '2'" );
 
-                if ( empty( $signups ) ) {
+                if ( ! empty( $status_2_ids ) ) {
+                        $signups = get_users( array(
+                                'fields'  => 'all_with_meta',
+                                'include' => $status_2_ids,
+                        ) );
+                } else {
                         return;
                 }
 
                 foreach ( $signups as $signup ) {
                         $meta = array();
 
+                        if ( empty( $signup->activation_key ) )
+                                $signup->activation_key = wp_hash( $signup->ID );
+
                         if ( bp_is_active( 'xprofile' ) ) {
                                 $meta['field_1'] = $signup->display_name;
                         }