Changeset 3666

Timestamp:

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

Author:

boonebgorges

Message:

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

Location:

trunk

Files:

• bp-activity.php (modified) (1 diff)
• bp-activity/bp-activity-filters.php (modified) (1 diff)
• bp-blogs/bp-blogs-templatetags.php (modified) (1 diff)
• bp-core.php (modified) (1 diff)
• bp-core/bp-core-settings.php (modified) (1 diff)
• bp-core/bp-core-signup.php (modified) (5 diffs)
• bp-core/bp-core-templatetags.php (modified) (1 diff)

trunk/bp-activity.php

@@ -547 +547 @@
 
     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 ) {

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

@@ -114 +114 @@
  */
 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 );

trunk/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']) ) {

trunk/bp-core.php

@@ -283 +283 @@
 
     return apply_filters( 'bp_core_get_page_names', $pages );
-}
-
-/**
- * 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' );
 }
 

trunk/bp-core/bp-core-settings.php

@@ -52 +52 @@
         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.

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 ) ) );
 

trunk/bp-core/bp-core-templatetags.php

@@ -1279 +1279 @@
         extract( $r, EXTR_SKIP );
 
-        $signup_avatar_dir = ( !empty( $_POST['signup_avatar_dir'] ) ) ? $_POST['signup_avatar_dir'] : $bp->signup->avatar_dir;
+        if ( !empty( $_POST['signup_avatar_dir'] ) ) {
+            $signup_avatar_dir = $_POST['signup_avatar_dir'];
+        } else if ( !empty( $bp->signup->avatar_dir ) ) {
+            $signup_avatar_dir = $bp->signup->avatar_dir;
+        }
 
         if ( empty( $signup_avatar_dir ) ) {