Ticket #34306: 34306.diff

src/wp-admin/includes/schema.php

@@ -356 +356 @@
         $guessurl = wp_guess_url();
         /**
          * Fires before creating WordPress options and populating their default values.
          *
          * @since 2.6.0
          */
         do_action( 'populate_options' );
 
         if ( ini_get('safe_mode') ) {
                 // Safe mode can break mkdir() so use a flat structure by default.
                 $uploads_use_yearmonth_folders = 0;
         } else {
                 $uploads_use_yearmonth_folders = 1;
         }
 
-        $template = WP_DEFAULT_THEME;
+        $template = $stylesheet = WP_DEFAULT_THEME;
+        if ( defined( 'WP_DEFAULT_THEME_NEW_DEFAULT' ) ) {
+                $theme = wp_get_theme( WP_DEFAULT_THEME_NEW_DEFAULT );
+                if ( ! $theme->errors() ) {
+                        $template = $stylesheet = WP_DEFAULT_THEME_NEW_DEFAULT;
+                }
+        }
+
         // If default theme is a child theme, we need to get its template
         $theme = wp_get_theme( $template );
         if ( ! $theme->errors() )
                 $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)
            or a valid timezone string (America/New_York). See http://us3.php.net/manual/en/timezones.php
            for all timezone strings supported by PHP.
         */
         $offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
         if ( is_numeric( $offset_or_tz ) )
                 $gmt_offset = $offset_or_tz;
         elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) )
@@ -420 +427 @@
         'comment_moderation' => 0,
         'moderation_notify' => 1,
         'permalink_structure' => '',
         'blog_charset' => 'UTF-8',
         'moderation_keys' => '',
         'active_plugins' => array(),
         'category_base' => '',
         'ping_sites' => 'http://rpc.pingomatic.com/',
         'comment_max_links' => 2,
         'gmt_offset' => $gmt_offset,
 
         // 1.5
         'default_email_category' => 1,
         'recently_edited' => '',
         'template' => $template,
-        'stylesheet' => WP_DEFAULT_THEME,
+        'stylesheet' => $stylesheet,
         'comment_whitelist' => 1,
         'blacklist_keys' => '',
         'comment_registration' => 0,
         'html_type' => 'text/html',
 
         // 1.5.1
         'use_trackback' => 0,
 
         // 2.0
         'default_role' => 'subscriber',
         'db_version' => $wp_db_version,
 
         // 2.0.1
         'uploads_use_yearmonth_folders' => $uploads_use_yearmonth_folders,
         'upload_path' => '',

src/wp-includes/default-constants.php

@@ -339 +339 @@
          */
         define('TEMPLATEPATH', get_template_directory());
 
         /**
          * Filesystem path to the current active template stylesheet directory
          * @since 2.1.0
          */
         define('STYLESHEETPATH', get_stylesheet_directory());
 
         /**
          * Slug of the default theme for this install.
          * Used as the default theme when installing new sites.
          * Will be used as the fallback if the current theme doesn't exist.
          * @since 3.0.0
          */
-        if ( !defined('WP_DEFAULT_THEME') )
+        if ( !defined('WP_DEFAULT_THEME') ) {
                 define( 'WP_DEFAULT_THEME', 'twentyfifteen' );
+                define( 'WP_DEFAULT_THEME_NEW_DEFAULT', 'twentysixteen' );
+        }
 
 }