Ticket #25498: 25498.2.diff

src/wp-admin/includes/schema.php

@@ -330 +330 @@
         global $wpdb, $wp_db_version, $current_site, $wp_current_db_version;
 
         $guessurl = wp_guess_url();
+        /**
+         * Fires before creating WordPress options and setting their default values.
+         *
+         * @since 2.6.0
+         */
+        do_action( 'populate_options' );
 
-        do_action('populate_options');
-
         if ( ini_get('safe_mode') ) {
                 // Safe mode can break mkdir() so use a flat structure by default.
                 $uploads_use_yearmonth_folders = 0;
@@ -929 +933 @@
          *
          * @since 3.7.0
          *
-         * @param array $sitemeta Associative of meta keys and values to be inserted.
-         * @param int $network_id Network ID being created.
+         * @param array $sitemeta   Associative array of meta keys and values to be inserted.
+         * @param int   $network_id Network ID being created.
          */
         $sitemeta = apply_filters( 'populate_network_meta', $sitemeta, $network_id );