Changeset 35738 for trunk/src/wp-admin/includes/schema.php

Timestamp:

11/25/2015 09:44:02 PM (9 years ago)

Author:

wonderboymusic

Message:

Upgrade: New themes are not automatically installed on upgrade. This can still be explicitly asked for by defining CORE_UPGRADE_SKIP_NEW_BUNDLED as false.

In populate_options(), if the theme specified by WP_DEFAULT_THEME doesn't exist, fall back to the latest core default theme. If we can't find a core default theme, WP_DEFAULT_THEME is the best we can do.

Props nacin, jeremyfelt, dd32.
See #34306.

File:

• trunk/src/wp-admin/includes/schema.php (modified) (3 diffs)

trunk/src/wp-admin/includes/schema.php

@@ -369 +369 @@
     }
 
-    $template = WP_DEFAULT_THEME;
-    // 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();
+    // 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 we can't find a core default theme, WP_DEFAULT_THEME is the best we can do.
+    if ( $theme ) {
+        $stylesheet = $theme->get_stylesheet();
+        $template   = $theme->get_template();
+    }
 
     $timezone_string = '';
@@ -434 +441 @@
     'recently_edited' => '',
     'template' => $template,
-    'stylesheet' => WP_DEFAULT_THEME,
+    'stylesheet' => $stylesheet,
     'comment_whitelist' => 1,
     'blacklist_keys' => '',
@@ -915 +922 @@
     $stylesheet = get_option( 'stylesheet' );
     $allowed_themes = array( $stylesheet => true );
-    if ( $template != $stylesheet )
+
+    if ( $template != $stylesheet ) {
         $allowed_themes[ $template ] = true;
-    if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template )
+    }
+
+    if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template ) {
         $allowed_themes[ WP_DEFAULT_THEME ] = true;
+    }
+
+    // If WP_DEFAULT_THEME doesn't exist, also whitelist the latest core default theme.
+    if ( ! wp_get_theme( WP_DEFAULT_THEME )->exists() ) {
+        if ( $core_default = WP_Theme::get_core_default_theme() ) {
+            $allowed_themes[ $core_default->get_stylesheet() ] = true;
+        }
+    }
 
     if ( 1 == $network_id ) {