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

Timestamp:

03/22/2010 11:34:23 AM (17 years ago)

Author:

apeatling

Message:

Added new install/upgrade wizard. Removed root components and replaced them with actual WordPress pages. Testing on WordPress vhost/novhost and root profile support still to do.

File:

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

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

@@ -246 +246 @@
 
 function bp_core_validate_user_signup( $user_name, $user_email ) {
-        global $wpdb;
+        global $wpdb, $bp;
 
         $errors = new WP_Error();
@@ -258 +258 @@
 
         $db_illegal_names = get_site_option( 'illegal_names' );
-        $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', BP_GROUPS_SLUG, BP_MEMBERS_SLUG, BP_FORUMS_SLUG, BP_BLOGS_SLUG, BP_REGISTER_SLUG, BP_ACTIVATION_SLUG ) );
+        $filtered_illegal_names = apply_filters( 'bp_core_illegal_usernames', array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', BP_GROUPS_SLUG, $bp->members->slug, BP_FORUMS_SLUG, BP_BLOGS_SLUG, BP_REGISTER_SLUG, BP_ACTIVATION_SLUG ) );
 
         $illegal_names = array_merge( (array)$db_illegal_names, (array)$filtered_illegal_names );
@@ -362 +362 @@
                 $activation_key = wp_hash( $user_id );
                 update_usermeta( $user_id, 'activation_key', $activation_key );
-                bp_core_signup_send_validation_email( $user_id, $activation_key );
+                bp_core_signup_send_validation_email( $user_id, $user_email, $activation_key );
         }
 
@@ -508 +508 @@
 }
 
-function bp_core_signup_send_validation_email( $user_id, $key ) {
+function bp_core_signup_send_validation_email( $user_id, $user_email, $key ) {
         $activate_url = bp_get_activation_page() ."?key=$key";
         $activate_url = clean_url( $activate_url );