Changeset 8195

Timestamp:

03/28/2014 11:47:39 PM (12 years ago)

Author:

imath

Message:

Clean up bp_update_to_2_0() and BP_Members_Admin class

Improve code formatting

props johnjamesjacoby

See #5374

Location:

trunk

Files:

• bp-core/bp-core-update.php (modified) (3 diffs)
• bp-members/bp-members-admin.php (modified) (1 diff)

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

@@ -343 +343 @@
         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() ) {
@@ -380 +381 @@
                         $user_email = sanitize_email( $signup->user_email );
 
-                        $args = array(
+                        BP_Signup::add( array(
                                 'user_login'     => $user_login,
                                 'user_email'     => $user_email,
@@ -386 +387 @@
                                 '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' );
-                }
-        }
-
-        /** Add BP options to the options table ******************************/
+                        delete_user_option( $signup->ID, 'user_level'   );
+                }
+        }
+
+        /** Add BP options to the options table ***********************************/
+
         bp_add_options();
 }

trunk/bp-members/bp-members-admin.php

@@ -167 +167 @@
                                 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 );