Changeset 4259

Timestamp:

04/23/2011 05:28:06 PM (15 years ago)

Author:

djpaul

Message:

No need to include registration.php; file was merged with user.php in WP 3.1.

Location:

trunk

Files:

• bp-activity/bp-activity-filters.php (modified) (1 diff)
• bp-activity/bp-activity-functions.php (modified) (1 diff)
• bp-members/bp-members-signup.php (modified) (3 diffs)
• bp-settings/bp-settings-actions.php (modified) (1 diff)

trunk/bp-activity/bp-activity-filters.php

@@ -114 +114 @@
  */
 function bp_activity_at_name_filter( $content ) {
-    if ( ! function_exists( 'username_exists' ) )
-        require_once( ABSPATH . WPINC . '/registration.php' );
-
     $usernames = bp_activity_find_mentions( $content );
 

trunk/bp-activity/bp-activity-functions.php

@@ -42 +42 @@
 
     if ( $usernames = bp_activity_find_mentions( strip_tags( $activity->content ) ) ) {
-        if ( ! function_exists( 'username_exists' ) )
-            require_once( ABSPATH . WPINC . '/registration.php' );
-
         foreach( (array)$usernames as $username ) {
             if ( !$user_id = username_exists( $username ) )

trunk/bp-members/bp-members-signup.php

@@ -296 +296 @@
     global $wpdb;
 
-    if ( ! function_exists( 'validate_username' ) )
-        require_once( ABSPATH . WPINC . '/registration.php' );
-
     $errors = new WP_Error();
     $user_email = sanitize_email( $user_email );
@@ -376 +373 @@
     } else {
         $errors = new WP_Error();
-
-        if ( ! function_exists( 'wp_insert_user' ) )
-            require_once( ABSPATH . WPINC . '/registration.php' );
 
         $user_id = wp_insert_user( array(
@@ -486 +480 @@
     }
 
-    require_once( ABSPATH . WPINC . '/registration.php' );
-
     // Update the display_name
     wp_update_user( array( 'ID' => $user_id, 'display_name' => bp_core_get_user_displayname( $user_id ) ) );

trunk/bp-settings/bp-settings-actions.php

@@ -14 +14 @@
         // Nonce check
         check_admin_referer('bp_settings_general');
-
-        if ( ! function_exists( 'email_exists' ) )
-            require_once( ABSPATH . WPINC . '/registration.php' );
 
         // Validate the user again for the current password when making a big change