Changeset 8922

Timestamp:

08/14/2014 08:06:28 PM (12 years ago)

Author:

imath

Message:

Do not interfere with WordPress sign-up process when the user is created from the blog or the network administration.

On multisite config, make sure the activation email and the welcome email generated by WordPress are not modified by BuddyPress if the user was created from the User Administration panel. In this case, user needs to receive the built in activation link and/or the login and password generated by WordPress.

Props godavid33, r-a-y

Fixes #5789

File:

• trunk/src/bp-core/bp-core-filters.php (modified) (3 diffs)

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

@@ -251 +251 @@
 
         // Don't touch the email when a user is registered by the site admin
-        if ( is_admin() )
+        if ( ( is_admin() || is_network_admin() ) && buddypress()->members->admin->signups_page != get_current_screen()->id ) {
                 return $welcome_email;
+        }
+
+        if ( strpos( bp_get_requested_url(), 'wp-activate.php' ) !== false ) {
+                return $welcome_email;
+        }
 
         // Don't touch the email if we don't have a custom registration template
-        if ( ! bp_has_custom_signup_page() )
+        if ( ! bp_has_custom_signup_page() ) {
                 return $welcome_email;
+        }
 
         // [User Set] Replaces 'PASSWORD' in welcome email; Represents value set by user
@@ -280 +286 @@
 function bp_core_filter_blog_welcome_email( $welcome_email, $blog_id, $user_id, $password ) {
 
-        // Don't touch the email when a user is registered by the site admin.
-        if ( is_admin() )
+        // Don't touch the email when a user is registered by the site admin
+        if ( ( is_admin() || is_network_admin() ) && buddypress()->members->admin->signups_page != get_current_screen()->id ) {
                 return $welcome_email;
+        }
 
         // Don't touch the email if we don't have a custom registration template
@@ -352 +359 @@
 function bp_core_activation_signup_user_notification( $user, $user_email, $key, $meta ) {
 
+        if ( is_admin() ) {
+                // If the user is created from the WordPress Add User screen, don't send BuddyPress signup notifications
+                if( in_array( get_current_screen()->id, array( 'user', 'user-network' ) ) ) {
+                        // If the Super Admin want to skip confirmation email
+                        if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
+                                return false;
+
+                        // WordPress will manage the signup process
+                        } else {
+                                return $user;
+                        }
+
+                /** 
+                 * There can be a case where the user was created without the skip confirmation
+                 * And the super admin goes in pending accounts to resend it. In this case, as the
+                 * meta['password'] is not set, the activation url must be WordPress one
+                 */
+                } else if ( buddypress()->members->admin->signups_page == get_current_screen()->id ) {
+                        $is_hashpass_in_meta = maybe_unserialize( $meta );
+
+                        if ( empty( $is_hashpass_in_meta['password'] ) ) {
+                                return $user;
+                        }
+                }
+        }
+
         // Set up activation link
         $activate_url = bp_get_activation_page() . "?key=$key";