Ticket #25762: 25762.10.diff

wp-admin/includes/upgrade.php

@@ -89 +89 @@
         /**
          * Fires after a site is fully installed.
          *
+         * Note: this hook only ever fires once when WP itself is being installed.
+         * It is never fired afterwards.
+         *
+         * To customize new sites on WP multisite installations, use either of:
+         *
+         * - wp_install_defaults
+         * - wpmu_new_blog
+         *
          * @since 3.9.0
          *
-         * @param WP_User $user The site owner.
+         * @param int $user_id The site owner's id.
          */
-        do_action( 'wp_install', $user );
+        do_action( 'wp_install', $user_id );
 
         return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $user_password, 'password_message' => $message);
 }
@@ -250 +258 @@
                 if ( !is_super_admin( $user_id ) && $user_id != 1 )
                         $wpdb->delete( $wpdb->usermeta, array( 'user_id' => $user_id , 'meta_key' => $wpdb->base_prefix.'1_capabilities' ) );
         }
+
+        /**
+         * Fires after a site's defaults are fully installed.
+         *
+         * Note: this hook fires once when WP itself is being installed, and once per
+         * additional sites on multisite installations. In both cases, it is fired in
+         * the context of the newly installed site.
+         *
+         * For multisite installations, see also the wpmu_new_blog hook, which is
+         * fired at the very end of wpmu_create_blog() in the context of wherever
+         * the new site got installed.
+         *
+         * Note 2: the user is marked as an administrator when the hook fires on a
+         * single site install; this is not the case on a multisite install.
+         *
+         * @since 3.9.0
+         *
+         * @param int $user_id The site owner's id.
+         */
+        do_action( 'wp_install_defaults', $user_id );
 }
 endif;
 
@@ -267 +295 @@
  * @param string $password User's Password.
  */
 function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
+        $context = compact('blog_title', 'blog_url', 'user_id', 'password');
+
         $user = new WP_User( $user_id );
-        $email = $user->user_email;
         $name = $user->user_login;
+
+        $subject = __('New WordPress Site');
+        $email = $user->user_email;
+
         $message = sprintf(__("Your new WordPress site has been successfully set up at:
 
 %1\$s
@@ -285 +318 @@
 http://wordpress.org/
 "), $blog_url, $name, $password);
 
-        @wp_mail($email, __('New WordPress Site'), $message);
+        /**
+         * Fires before sending a new blog notification by email to that blog's admin.
+         *
+         * To override the email, or cancel it altogether, apply your custom logic
+         * and return false.
+         *
+         * @since 3.9.0
+         *
+         * @param boolean $send return false to prevent WP from sending an email
+         * @param array $context the arguments passed to wp_new_blog_notification()
+         */
+        if (apply_filters('wp_new_blog_notification', true, $context)) {
+                WP_DEBUG ? wp_mail($email, $subject, $message) : @wp_mail($email, $subject, $message);
+        }
 }
 endif;
 

wp-includes/ms-functions.php

@@ -1172 +1172 @@
         /**
          * Fires immediately after a new site is created.
          *
+         * See also the wp_install_defaults hook, which fires before the current
+         * blog's context is restored.
+         *
          * @since MU
          *
          * @param int    $blog_id Blog ID.

wp-includes/pluggable.php

@@ -1281 +1281 @@
  * @param string $plaintext_pass Optional. The user's plaintext password
  */
 function wp_new_user_notification($user_id, $plaintext_pass = '') {
+        $context = compact('user_id', 'plaintext_pass');
+
         $user = get_userdata( $user_id );
 
         // The blogname option is escaped with esc_html on the way into the database in sanitize_option
         // we want to reverse this for the plain text arena of emails.
         $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
+        $subject = sprintf(__('[%s] New User Registration', $blogname));
+        $email = get_option('admin_email');
+
         $message  = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n";
         $message .= sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
         $message .= sprintf(__('E-mail: %s'), $user->user_email) . "\r\n";
 
-        @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
+        /**
+         * Fires before sending a new user notification by email to that blog's admin.
+         *
+         * To override the email, or cancel it altogether, apply your custom logic
+         * and return false.
+         *
+         * @since 3.9.0
+         *
+         * @param boolean $send return false to prevent WP from sending an email
+         * @param array $context the arguments passed to wp_new_user_notification()
+         */
+        if (apply_filters('wp_new_user_notification_admin', true, $context)) {
+                WP_DEBUG ? wp_mail($email, $subject, $message) : @wp_mail($email, $subject, $message);
+        }
 
         if ( empty($plaintext_pass) )
                 return;
 
+        $subject = sprintf(__('[%s] Your username and password'), $blogname);
+        $email = $user->user_email;
+
         $message  = sprintf(__('Username: %s'), $user->user_login) . "\r\n";
         $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
         $message .= wp_login_url() . "\r\n";
 
-        wp_mail($user->user_email, sprintf(__('[%s] Your username and password'), $blogname), $message);
-
+        /**
+         * Fires before sending a new user notification by email to that new user.
+         *
+         * To override the email, or cancel it altogether, apply your custom logic
+         * and return false.
+         *
+         * @since 3.9.0
+         *
+         * @param boolean $send return false to prevent WP from sending an email
+         * @param array $context the arguments passed to wp_new_user_notification()
+         */
+        if (apply_filters('wp_new_user_notification_user', true, $context)) {
+                WP_DEBUG ? wp_mail($email, $subject, $message) : @wp_mail($email, $subject, $message);
+        }
 }
 endif;