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

Timestamp:

11/05/2010 09:44:38 PM (16 years ago)

Author:

djpaul

Message:

Deprecated bp_core_is_multisite()

File:

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

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

@@ -139 +139 @@
 
                 /* Finally, sign up the user and/or blog */
-                if ( isset( $_POST['signup_with_blog'] ) && bp_core_is_multisite() )
+                if ( isset( $_POST['signup_with_blog'] ) && is_multisite() )
                     bp_core_signup_blog( $blog_details['domain'], $blog_details['path'], $blog_details['blog_title'], $_POST['signup_username'], $_POST['signup_email'], $usermeta );
                 else {
@@ -163 +163 @@
         $bp->signup->step = 'completed-confirmation';
 
-        if ( bp_core_is_multisite() ) {
+        if ( is_multisite() ) {
             /* Get the activation key */
             if ( !$bp->signup->key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $_POST[ 'signup_username' ], $_POST[ 'signup_email' ] ) ) ) {
@@ -225 +225 @@
 
         /* Check for an uploaded avatar and move that to the correct user folder */
-        if ( bp_core_is_multisite() )
+        if ( is_multisite() )
             $hashed_key = wp_hash( $_GET['key'] );
         else
@@ -369 +369 @@
 
 function bp_core_validate_blog_signup( $blog_url, $blog_title ) {
-    if ( !bp_core_is_multisite() || !function_exists( 'wpmu_validate_blog_signup' ) )
+    if ( !is_multisite() || !function_exists( 'wpmu_validate_blog_signup' ) )
         return false;
 
@@ -379 +379 @@
 
     /* Multisite installs have their own install procedure */
-    if ( bp_core_is_multisite() ) {
+    if ( is_multisite() ) {
         wpmu_signup_user( $user_login, $user_email, $usermeta );
 
@@ -423 +423 @@
      */
     if ( apply_filters( 'bp_core_signup_send_activation_key', true ) ) {
-        if ( !bp_core_is_multisite() ) {
+        if ( !is_multisite() ) {
             $activation_key = wp_hash( $user_id );
             update_user_meta( $user_id, 'activation_key', $activation_key );
@@ -436 +436 @@
 
 function bp_core_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) {
-    if ( !bp_core_is_multisite() || !function_exists( 'wpmu_signup_blog' ) )
+    if ( !is_multisite() || !function_exists( 'wpmu_signup_blog' ) )
         return false;
 
@@ -448 +448 @@
 
     /* Multisite installs have their own activation routine */
-    if ( bp_core_is_multisite() ) {
+    if ( is_multisite() ) {
         $user = wpmu_activate_signup( $key );
 
@@ -498 +498 @@
 
     /* Set the password on multisite installs */
-    if ( bp_core_is_multisite() && !empty( $user['meta']['password'] ) )
+    if ( is_multisite() && !empty( $user['meta']['password'] ) )
         $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->users SET user_pass = %s WHERE ID = %d", $user['meta']['password'], $user_id ) );
 
@@ -618 +618 @@
         bp_core_redirect( bp_get_root_domain() . '/' . BP_REGISTER_SLUG . '/' );
 }
-if ( bp_core_is_multisite() )
+if ( is_multisite() )
     add_action( 'wp', 'bp_core_wpsignup_redirect' );
 else