Ticket #2997: 2997.diff

bp-activity.php

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

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 */
                 $account_details = bp_core_validate_user_signup( $_POST['signup_username'], $_POST['signup_email'] );
 
@@ -217 +215 @@
         /* Check if an activation key has been passed */
         if ( isset( $_GET['key'] ) ) {
 
-                bp_core_maybe_include_user_registration_file();
-
                 /* Activate the signup */
                 $user = apply_filters( 'bp_core_activate_account', bp_core_activate_signup( $_GET['key'] ) );
 
@@ -352 +348 @@
 function bp_core_validate_user_signup( $user_name, $user_email ) {
         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(
                         'user_login' => $user_login,
                         'user_pass' => $user_password,

bp-core/bp-core-settings.php

@@ -51 +51 @@
         if ( isset($_POST['submit']) ) {
                 check_admin_referer('bp_settings_general');
 
-                bp_core_maybe_include_user_registration_file();
+                if ( ! function_exists( 'email_exists' ) )
+                        require_once( ABSPATH . WPINC . '/registration.php' );
 
                 // Form has been submitted and nonce checks out, lets do it.
 

bp-activity/bp-activity-filters.php

@@ -113 +113 @@
  * @param string $content The activity content
  */
 function bp_activity_at_name_filter( $content ) {
-        bp_core_maybe_include_user_registration_file();
+        if ( ! function_exists( 'username_exists' ) )
+                require_once( ABSPATH . WPINC . '/registration.php' );
 
         $usernames = bp_activity_find_mentions( $content );
 

bp-blogs/bp-blogs-templatetags.php

@@ -325 +325 @@
         global $current_user, $current_site;
         global $bp;
 
-        bp_core_maybe_include_user_registration_file();
-
         if ( isset($_POST['submit']) ) {
                 bp_blogs_validate_blog_signup();
         } else {

bp-core.php

@@ -285 +285 @@
 }
 
 /**
- * If we're not on WordPress 3.1+, then include the file containing the user registration methods.
- *
- * @global float $wp_version WordPress version number
- * @since 1.3
- */
-function bp_core_maybe_include_user_registration_file() {
-        global $wp_version;
-
-        if ( $wp_version >= 3.1 )
-                return;
-
-        require_once( ABSPATH . WPINC . '/registration.php' );
-}
-
-/**
  * bp_core_admin_menu_init()
  *
  * Initializes the wp-admin area "BuddyPress" menus and sub menus.