Ticket #25762: 25762.8.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;
 

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.