Changeset 3666 for trunk/bp-core/bp-core-signup.php

Timestamp:

01/06/2011 03:17:09 PM (15 years ago)

Author:

boonebgorges

Message:

Refactors registration.php requires so they don't require an additional function. Fixes #2997. Props nacin

File:

• trunk/bp-core/bp-core-signup.php (modified) (5 diffs)

trunk/bp-core/bp-core-signup.php

@@ -35 +35 @@
         /* Check the nonce */
         check_admin_referer( 'bp_new_signup' );
-
-        bp_core_maybe_include_user_registration_file();
 
         /* Check the base account details for problems */
@@ -217 +215 @@
     /* Check if an activation key has been passed */
     if ( isset( $_GET['key'] ) ) {
-
-        bp_core_maybe_include_user_registration_file();
 
         /* Activate the signup */
@@ -353 +349 @@
     global $wpdb;
 
+    if ( ! function_exists( 'validate_username' ) )
+        require_once( ABSPATH . WPINC . '/registration.php' );
+
     $errors = new WP_Error();
     $user_email = sanitize_email( $user_email );
@@ -430 +429 @@
     } else {
         $errors = new WP_Error();
+
+        if ( ! function_exists( 'wp_insert_user' ) )
+            require_once( ABSPATH . WPINC . '/registration.php' );
 
         $user_id = wp_insert_user( array(
@@ -537 +539 @@
     }
 
-    /* Update the user_url and display_name */
+    // Update the user_url and display_name
+    // Support for WP < 3.1
+    if ( ! function_exists( 'wp_update_user' ) ) 
+        require_once( ABSPATH . WPINC . '/registration.php' );
+        
     wp_update_user( array( 'ID' => $user_id, 'user_url' => bp_core_get_user_domain( $user_id ), 'display_name' => bp_core_get_user_displayname( $user_id ) ) );