Changeset 4325

Timestamp:

05/02/2011 09:23:48 PM (14 years ago)

Author:

boonebgorges

Message:

Fixes PHP notices during registration process on MS

Location:

trunk

Files:

• bp-core/bp-core-filters.php (modified) (1 diff)
• bp-members/bp-members-signup.php (modified) (1 diff)

trunk/bp-core/bp-core-filters.php

@@ -230 +230 @@
 
     /* If this is an admin generated activation, add a param to email the user login details */
-    if ( is_admin() )
-        $email = '&e=1';
+    $email = is_admin() ? '&e=1' : '';
 
     $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : esc_html( get_site_option( "site_name" ) );
     $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
-    $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url . $email, esc_url( "http://{$domain}{$path}" ) );
+    $message = sprintf( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url . $email );
     $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
 

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

@@ -370 +370 @@
     if ( is_multisite() ) {
         wpmu_signup_user( $user_login, $user_email, $usermeta );
+        
+        // On multisite, the user id is not created until the user activates the account
+        // but we need to cast $user_id to pass to the filters
+        $user_id = false;
 
     } else {