Ticket #25762: 25762.6.diff

wp-admin/includes/upgrade.php

@@ -86 +86 @@
 
         wp_cache_flush();
 
-        /**
-         * Fires after a site is fully installed.
-         *
-         * @since 3.9.0
-         *
-         * @param WP_User $user The site owner.
-         */
-        do_action( 'wp_install', $user );
-
         return array('url' => $guessurl, 'user_id' => $user_id, 'password' => $user_password, 'password_message' => $message);
 }
 endif;
@@ -250 +241 @@
                 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 is 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.
+     *
+         * @since 3.9.0
+         *
+         * @param int $user_id The site owner's id.
+         */
+        do_action( 'wp_install', $user_id );
 }
 endif;