Ticket #39318: 39318.3.patch

wp-admin/network/site-new.php

@@ -67 +67 @@
                 'public' => 1,
         );
 
+        // Get specified theme or fallback to network theme or WP_DEFAULT_THEME constant
+        $theme = wp_get_theme( $blog['theme'] );
+        if ( $theme->exists() ) {
+            $meta['stylesheet'] = $theme->get_stylesheet();
+            $meta['template'] = $theme->get_template();
+
+                // Check if the theme is not network enabled
+                if ( ! in_array( $meta['stylesheet'], WP_Theme::get_allowed_on_network(), true) ) {
+                        WP_Theme::network_enable_theme( $meta['stylesheet'] );
+                }
+        }
+
         // Handle translation installation for the new site.
         if ( isset( $_POST['WPLANG'] ) ) {
                 if ( '' === $_POST['WPLANG'] ) {
@@ -280 +292 @@
                 <tr class="form-field">
                         <td colspan="2"><p id="site-admin-email"><?php _e( 'A new user will be created if the above email address is not in the database.' ); ?><br /><?php _e( 'The username and a link to set the password will be mailed to this email address.' ); ?></p></td>
                 </tr>
-        </table>
 
-        <?php
+                <?php $themes = wp_get_themes( array( 'errors' => false ) );
+                if ( ! empty( $themes ) && is_array( $themes ) ) : ?>
+                        <tr class="form-field">
+                                <th scope="row"><label for="site-theme"><?php _e( 'Site Theme' ); ?></label></th>
+                                <td>
+                    <select name="blog[theme]" id="site-theme">
+                                        <?php foreach ( $themes as $theme ) : ?>
+                        <option value="<?php echo $theme->stylesheet; ?>" <?php selected( $theme->stylesheet, WP_DEFAULT_THEME ); ?>><?php echo $theme; ?></option>
+                                        <?php endforeach; ?>
+                    </select>
+                                </td>
+                        </tr>
+                <?php endif; // Theme. ?>
+    </table>
+
+    <?php
         /**
          * Fires at the end of the new site form in network admin.
          *