Changeset 34112

Timestamp:

09/14/2015 03:27:47 AM (11 years ago)

Author:

boonebgorges

Message:

Send multisite site/user signup emails via hooked functions.

Site and user signup notifications are moved to the new actions
'after_signup_site' and 'after_signup_user'. Site and user activation
notifications are moved to the existing actions 'wpmu_activate_blog' and
'wpmu_activate_user'.

Props dshanske, thomaswm, jeremyfelt.
See #33587..

Location:

trunk/src/wp-includes

Files:

• ms-default-filters.php (modified) (2 diffs)
• ms-functions.php (modified) (4 diffs)

trunk/src/wp-includes/ms-default-filters.php

@@ -26 +26 @@
 add_action( 'wpmu_new_user', 'newuser_notify_siteadmin' );
 add_action( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 );
+add_action( 'wpmu_activate_user', 'wpmu_welcome_user_notification', 10, 3 );
+add_action( 'after_signup_user', 'wpmu_signup_user_notification', 10, 4 );
 add_filter( 'sanitize_user', 'strtolower' );
 
@@ -32 +34 @@
 add_action( 'wpmu_new_blog', 'wpmu_log_new_registrations', 10, 2 );
 add_action( 'wpmu_new_blog', 'newblog_notify_siteadmin', 10, 2 );
+add_action( 'wpmu_activate_blog', 'wpmu_welcome_notification', 10, 5 );
+add_action( 'after_signup_site', 'wpmu_signup_blog_notification', 10, 7 );
 
 // Register Nonce

trunk/src/wp-includes/ms-functions.php

@@ -746 +746 @@
         ) );
 
-        wpmu_signup_blog_notification($domain, $path, $title, $user, $user_email, $key, $meta);
+        /**
+         * Fires after site signup information has been written to the database.
+         *
+         * @since 4.4.0
+         *
+         * @param string $domain     The requested domain.
+         * @param string $path       The requested path.
+         * @param string $title      The requested site title.
+         * @param string $user       The user's requested login name.
+         * @param string $user_email The user's email address.
+         * @param string $key        The user's activation key
+         * @param array  $meta       By default, contains the requested privacy setting and lang_id.
+         */
+        do_action( 'after_signup_site', $domain, $path, $title, $user, $user_email, $key, $meta );
 }
 
@@ -783 +796 @@
         ) );
 
-        wpmu_signup_user_notification($user, $user_email, $key, $meta);
+        /**
+         * Fires after a user's signup information has been written to the database.
+         *
+         * @since 4.4.0
+         *
+         * @param string $user       The user's requested login name.
+         * @param string $user_email The user's email address.
+         * @param string $key        The user's activation key
+         * @param array  $meta       Additional signup meta. By default, this is an empty array.
+         */
+        do_action( 'after_signup_user', $user, $user_email, $key, $meta );
 }
 
@@ -1028 +1051 @@
                         return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
 
-                wpmu_welcome_user_notification( $user_id, $password, $meta );
                 /**
                  * Fires immediately after a new user is activated.
@@ -1056 +1078 @@
 
         $wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
-        wpmu_welcome_notification($blog_id, $user_id, $password, $signup->title, $meta);
         /**
          * Fires immediately after a site is activated.