Ticket #25020: 25020.diff

src/wp-admin/includes/schema.php

@@ -828 +828 @@
  *      so the error code must be checked) or failure.
  */
 function populate_network( $network_id = 1, $domain = '', $email = '', $site_name = '', $path = '/', $subdomain_install = false ) {
+        /**
+         * @var WPDB $wpdb
+         * @var WP_Rewrite $wp_rewrite
+         */
         global $wpdb, $current_site, $wp_db_version, $wp_rewrite;
 
         $errors = new WP_Error();
@@ -891 +895 @@
 --The Team @ SITE_NAME' );
 
         $sitemeta = array(
-                'site_name' => $site_name,
-                'admin_email' => $site_user->user_email,
-                'admin_user_id' => $site_user->ID,
-                'registration' => 'none',
-                'upload_filetypes' => 'jpg jpeg png gif mp3 mov avi wmv midi mid pdf',
-                'blog_upload_space' => 100,
-                'fileupload_maxk' => 1500,
-                'site_admins' => $site_admins,
-                'allowedthemes' => $allowed_themes,
-                'illegal_names' => array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' ),
-                'wpmu_upgrade_site' => $wp_db_version,
-                'welcome_email' => $welcome_email,
-                'first_post' => __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start blogging!' ),
-                // @todo - network admins should have a method of editing the network siteurl (used for cookie hash)
-                'siteurl' => get_option( 'siteurl' ) . '/',
-                'add_new_users' => '0',
+                'site_name'                   => $site_name,
+                'admin_email'                 => $site_user->user_email,
+                'admin_user_id'               => $site_user->ID,
+                'registration'                => 'none',
+                'upload_filetypes'            => 'jpg jpeg png gif mp3 mov avi wmv midi mid pdf',
+                'blog_upload_space'           => 100,
+                'fileupload_maxk'             => 1500,
+                'site_admins'                 => $site_admins,
+                'allowedthemes'               => $allowed_themes,
+                'illegal_names'               => array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator', 'files' ),
+                'wpmu_upgrade_site'           => $wp_db_version,
+                'welcome_email'               => $welcome_email,
+                'first_post'                  => __( 'Welcome to <a href="SITE_URL">SITE_NAME</a>. This is your first post. Edit or delete it, then start blogging!' ),
+                'siteurl'                     => get_option( 'siteurl' ) . '/',
+                'add_new_users'               => '0',
                 'upload_space_check_disabled' => is_multisite() ? get_site_option( 'upload_space_check_disabled' ) : '1',
-                'subdomain_install' => intval( $subdomain_install ),
-                'global_terms_enabled' => global_terms_enabled() ? '1' : '0',
-                'ms_files_rewriting' => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
-                'initial_db_version' => get_option( 'initial_db_version' ),
-                'active_sitewide_plugins' => array(),
-                'WPLANG' => get_locale(),
+                'subdomain_install'           => intval( $subdomain_install ),
+                'global_terms_enabled'        => global_terms_enabled() ? '1' : '0',
+                'ms_files_rewriting'          => is_multisite() ? get_site_option( 'ms_files_rewriting' ) : '0',
+                'initial_db_version'          => get_option( 'initial_db_version' ),
+                'active_sitewide_plugins'     => array(),
+                'WPLANG'                      => get_locale(),
         );
         if ( ! $subdomain_install )
                 $sitemeta['illegal_names'][] = 'blog';
 
+        $sitemeta = wp_parse_args( apply_filters( 'populate_network_sitemeta', $sitemeta ) );
+
         $insert = '';
         foreach ( $sitemeta as $meta_key => $meta_value ) {
                 if ( is_array( $meta_value ) )