Ticket #25762: 25762.11.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.
@@ -112 +120 @@
 function wp_install_defaults( $user_id ) {
         global $wpdb, $wp_rewrite, $table_prefix;
 
+        $user = new WP_User($user_id);
+
         // Default category
         $cat_name = __('Uncategorized');
         /* translators: Default category slug */
@@ -239 +249 @@
                 $wp_rewrite->init();
                 $wp_rewrite->flush_rules();
 
-                $user = new WP_User($user_id);
                 $wpdb->update( $wpdb->options, array('option_value' => $user->user_email), array('option_name' => 'admin_email') );
 
                 // Remove all perms except for the login user.
@@ -250 +259 @@
                 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 set.
+         *
+         * Note: this hook fires once when WP itself is being installed, and once per
+         * additional site 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 WP_User $user The site owner.
+         */
+        do_action( 'wp_install_defaults', $user );
 }
 endif;
 
@@ -268 +297 @@
  */
 function wp_new_blog_notification($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 +317 @@
 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 string $blog_url Blog url.
+         * @param int $user_id User ID.
+         * @param string $password User's Password.
+         */
+        if ( apply_filters( 'wp_new_blog_notification', true, $blog_title, $blog_url, $user_id, $password ) ) {
+                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.