Ticket #39318: 39318.1.patch

wp-admin/network/site-new.php

@@ -57 +57 @@
 
         $title = $blog['title'];
 
+        // Get specified theme or fallback to network theme or WP_DEFAULT_THEME constant
+        $theme = wp_get_theme( $blog['theme'] );
+        if ( $theme->exists() ) {
+                $stylesheet = $theme->get_stylesheet();
+                $template   = $theme->get_template();
+        } else {
+                $theme = wp_get_theme( get_network_option( null, 'default_theme', WP_DEFAULT_THEME ) );
+                $stylesheet = $theme->get_stylesheet();
+                $template   = $theme->get_template();
+        }
+
         $meta = array(
-                'public' => 1
+                'public'      => 1,
+                'stylesheet'  => $stylesheet,
+                'template'    => $template,
         );
 
         // Handle translation install for the new site.
@@ -246 +259 @@
                 <tr class="form-field">
                         <td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>
                 </tr>
+
+                <?php
+                $themes = wp_get_themes( array( 'errors' => false, 'allowed' => 'network' ) );
+                if ( ! empty( $themes ) && is_array( $themes ) ) : ?>
+                        <tr class="form-field">
+                                <th scope="row"><label for="site-theme"><?php _e( 'Site Theme' ); ?></label></th>
+                                <td>
+                                        <?php
+                                        // Network default.
+                                        echo "<select name='blog[theme]' id='site-theme'>\n";
+                                        $default_theme = get_network_option( null, 'default_theme', WP_DEFAULT_THEME );
+                                        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>
+                <?php endif; // Theme. ?>
         </table>
 
         <?php