Ticket #13743: 13743.5.patch

wp-admin/includes/schema.php

@@ -364 +364 @@
         } else {
                 $uploads_use_yearmonth_folders = 1;
         }
+        
+        $stylesheet = $template = WP_DEFAULT_THEME;
+        
+        // If it's multisite and WP_DEFAULT_THEME is not redifined in WP Config, get the network default theme 
+        if ( is_multisite() ) { 
+                $default_theme = get_site_option( 'default_theme', false ); 
+                
+                if ( ! empty( $default_theme ) ) { 
+                        $theme = wp_get_theme( $default_theme ); 
+                        if ( $theme->exists() ) { 
+                                $stylesheet = $theme->get_stylesheet(); 
+                                $template   = $theme->get_template(); 
+                        } 
+                } 
+        } 
 
         // If WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme.
-        $stylesheet = $template = WP_DEFAULT_THEME;
-        $theme = wp_get_theme( WP_DEFAULT_THEME );
-        if ( ! $theme->exists() ) {
-                $theme = WP_Theme::get_core_default_theme();
+        if ( empty ( $theme ) || ! $theme->exists() ) {
+                $theme = wp_get_theme( WP_DEFAULT_THEME );
+        
+                if ( ! $theme->exists() ) {
+                        $theme = WP_Theme::get_core_default_theme();
+                }
         }
 
         // If we can't find a core default theme, WP_DEFAULT_THEME is the best we can do.

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.
@@ -202 +202 @@
                 </table>
                 <h2><?php _e( 'New Site Settings' ); ?></h2>
                 <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_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"; 
+                                        } 
+                                        else
+                                        {
+                                                _e( 'You currently don\'t have any themes installed' ); 
+                                        }
+                                        ?> 
+                                </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">