Ticket #13743: 13743.2.patch

wp-admin/includes/schema.php

@@ -378 +378 @@
                 $template   = $theme->get_template();
         }
 
+        // If it's multisite and WP_DEFAULT_THEME is not redifined in WP Config, get the network default theme
+        if ( is_multisite() && WP_DEFAULT_THEME === WP_Theme::get_core_default_theme()->get_stylesheet() ) {
+                $default_theme = get_site_option( 'default_theme', WP_Theme::get_core_default_theme()->get_stylesheet() );
+                if ( ! empty( $default_theme ) ) {
+                        $theme = wp_get_theme( $default_theme );
+                        if ( $theme->exists() ) {
+                                $stylesheet = $theme->get_stylesheet();
+                                $template   = $theme->get_template();
+                        }
+                }
+        }
+
         $timezone_string = '';
         $gmt_offset = 0;
         /* translators: default GMT offset or timezone string. Must be either a valid offset (-12 to 14)

wp-admin/network/settings.php

@@ -59 +59 @@
                 'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author',
                 'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'global_terms_enabled',
                 'illegal_names', 'limited_email_domains', 'banned_email_domains', 'WPLANG', 'admin_email',
-                'first_comment_email',
+                'first_comment_email', 'default_theme'
         );
 
         // Handle translation install.
@@ -204 +204 @@
                 <table class="form-table">
 
                         <tr>
+                                <th scope="row"><label for="default_theme"><?php _e( 'Default Theme' ) ?></label></th>
+                                <td>
+                                        <?php
+                                        $themes = wp_get_themes( array( 'errors' => false, 'allowed' => 'network' ) );
+                                        if ( ! empty( $themes ) && is_array( $themes ) ) {
+                                                echo "<select name='default_theme' id='default_theme'>\n";
+                                                $default_theme = get_site_option( 'default_theme', WP_Theme::get_core_default_theme()->get_stylesheet() );
+                                                foreach ( $themes as $theme ) {
+                                                        printf( "\t<option value='%s' %s>%s</option>\n",
+                                                                $theme->stylesheet,
+                                                                selected( $theme->stylesheet, $default_theme, false ),
+                                                                $theme
+                                                        );
+                                                }
+                                                echo "</select>\n";
+                                        }
+                                        ?>
+                                </td>
+                        </tr>
+                        <tr>
                                 <th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th>
                                 <td>
                                         <textarea name="welcome_email" id="welcome_email" aria-describedby="welcome-email-desc" rows="5" cols="45" class="large-text">