Ticket #5374: 5374.sign-up-disabled.patch

bp-core/bp-core-update.php

@@ -342 +342 @@
 function bp_update_to_2_0() {
         global $wpdb;
 
-        /** Install activity tables for 'last_activity' **********************/
+        /** Install activity tables for 'last_activity' ***************************/
+
         bp_core_install_activity_streams();
 
-        /** Migrate 'last_activity' data *************************************/
+        /** Migrate 'last_activity' data ******************************************/
 
         bp_last_activity_migrate();
 
-        /** Migrate signups data *********************************************/
+        /** Migrate signups data **************************************************/
 
-        if ( bp_get_signup_allowed() && ! is_multisite() ) {
+        if ( ! is_multisite() ) {
 
                 if ( empty( $wpdb->signups ) ) {
                         bp_core_install_signups();
@@ -379 +380 @@
                         $user_login = preg_replace( '/\s+/', '', sanitize_user( $signup->user_login, true ) );
                         $user_email = sanitize_email( $signup->user_email );
 
-                        $args = array(
+                        BP_Signup::add( array(
                                 'user_login'     => $user_login,
                                 'user_email'     => $user_email,
                                 'registered'     => $signup->user_registered,
                                 'activation_key' => $signup->activation_key,
                                 'meta'           => $meta
-                        );
+                        ) );
 
-                        BP_Signup::add( $args );
-
                         // Deleting these options will remove signups from users count
                         delete_user_option( $signup->ID, 'capabilities' );
-                        delete_user_option( $signup->ID, 'user_level' );
+                        delete_user_option( $signup->ID, 'user_level'   );
                 }
         }
 
-        /** Add BP options to the options table ******************************/
+        /** Add BP options to the options table ***********************************/
+
         bp_add_options();
 }
 

bp-members/bp-members-admin.php

@@ -162 +162 @@
 
                 /** Signups **************************************************************/
 
-                if ( bp_get_signup_allowed() && is_admin() ) {
+                if ( is_admin() ) {
                         if ( ! is_multisite() ) {
                                 add_action( 'pre_user_query', array( $this, 'remove_signups_from_user_query'),  10, 1 );
                         }
 
+                        // Reorganise the views navigation in users.php and signups page
                         if ( current_user_can( $this->capability ) ) {
-                                // Reorganise the views navigation in users.php and signups page
                                 add_filter( "views_{$this->users_screen}", array( $this, 'signup_filter_view' ),    10, 1 );
                                 add_filter( 'set-screen-option',           array( $this, 'signup_screen_options' ), 10, 3 );
                         }
@@ -195 +195 @@
                 );
 
                 // Manage signups if allowed
-                if ( bp_get_signup_allowed() ) {
-                        $hooks['signups'] = $this->signups_page = add_users_page(
-                                __( 'Manage Signups',  'buddypress' ),
-                                __( 'Manage Signups',  'buddypress' ),
-                                $this->capability,
-                                'bp-signups',
-                                array( &$this, 'signups_admin' )
-                        );
-                }
+                $hooks['signups'] = $this->signups_page = add_users_page(
+                        __( 'Manage Signups',  'buddypress' ),
+                        __( 'Manage Signups',  'buddypress' ),
+                        $this->capability,
+                        'bp-signups',
+                        array( &$this, 'signups_admin' )
+                );
 
                 $edit_page = 'user-edit';
                 $this->users_page = 'users';